Changeset 80d8885 in mainline for uspace/srv/logger/namespace.c

Timestamp:

2012-08-16T15:08:19Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

dc5aa568

Parents:

32b26cf7

Message:

Set levels for individual contexts

File:

• uspace/srv/logger/namespace.c (modified) (2 diffs)

uspace/srv/logger/namespace.c

@@ -71 +71 @@
         if (context >= namespace->context_count) {
                 fibril_mutex_unlock(&namespace->guard);
+                fprintf(stderr, "Invalid context!\n");
                 return LVL_FATAL;
         }
@@ -265 +266 @@
 }
 
+int namespace_change_context_level(logging_namespace_t *namespace, const char *context, log_level_t new_level)
+{
+        if (new_level >= LVL_LIMIT)
+                return ERANGE;
+
+        int rc;
+        fibril_mutex_lock(&namespace->guard);
+        for (size_t i = 0; i < namespace->context_count; i++) {
+                if (str_cmp(namespace->context[i].name, context) == 0) {
+                        namespace->context[i].level = new_level;
+                        rc = EOK;
+                        fibril_condvar_broadcast(&namespace->level_changed_cv);
+                        goto leave;
+                }
+        }
+        rc =  ENOENT;
+
+leave:
+        fibril_mutex_unlock(&namespace->guard);
+        return rc;
+}
+
 void namespace_wait_for_reader_change(logging_namespace_t *namespace, bool *has_reader_now)
 {
         fibril_mutex_lock(&namespace->guard);
-        log_level_t previous_level = namespace->level;
-        while (previous_level == namespace->level) {
-                fibril_condvar_wait(&namespace->level_changed_cv, &namespace->guard);
-        }
+        // FIXME: properly watch for state change
+        fibril_condvar_wait(&namespace->level_changed_cv, &namespace->guard);
         *has_reader_now = true;
         fibril_mutex_unlock(&namespace->guard);