Changeset 0a6a996 in mainline

Timestamp:

2012-08-16T09:21:59Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b52dd1de

Parents:

6e9e12b

Message:

Default level affects existing namespaces

Location:

uspace/srv/logger

Files:

• logger.h (modified) (1 diff)
• namespace.c (modified) (4 diffs)

uspace/srv/logger/logger.h

@@ -44 +44 @@
 #define NAME "logger"
 #define MAX_NAMESPACE_LENGTH 256
+#define LOG_LEVEL_USE_DEFAULT (LVL_LIMIT + 1)
 
 typedef struct logging_namespace logging_namespace_t;

uspace/srv/logger/namespace.c

@@ -55 +55 @@
 static LIST_INITIALIZE(namespace_list);
 
+static log_level_t namespace_get_actual_log_level(logging_namespace_t *namespace)
+{
+        fibril_mutex_lock(&namespace->guard);
+        log_level_t level = namespace->level;
+        fibril_mutex_unlock(&namespace->guard);
+
+        if (level == LOG_LEVEL_USE_DEFAULT)
+                level = get_default_logging_level();
+
+        return level;
+}
+
 static logging_namespace_t *namespace_find_no_lock(const char *name)
 {
@@ -100 +112 @@
         }
 
-        namespace->level = get_default_logging_level();
+        namespace->level = LOG_LEVEL_USE_DEFAULT;
 
         fibril_mutex_initialize(&namespace->guard);
@@ -188 +200 @@
 bool namespace_has_reader(logging_namespace_t *namespace, log_level_t level)
 {
-        fibril_mutex_lock(&namespace->guard);
-        bool has_reader = level <= namespace->level;
-        fibril_mutex_unlock(&namespace->guard);
-        return has_reader;
+        return level <= namespace_get_actual_log_level(namespace);
 }
 
@@ -208 +217 @@
 void namespace_add_message(logging_namespace_t *namespace, const char *message, log_level_t level)
 {
-        if (level <= namespace->level) {
+        if (level <= namespace_get_actual_log_level(namespace)) {
                 printf("[%s %d]: %s\n", namespace->name, level, message);
                 fprintf(namespace->logfile, "[%d]: %s\n", level, message);