Changeset 494f417 in mainline for uspace/srv/logger

Timestamp:

2012-08-16T11:58:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

7034b443

Parents:

eab3d04

Message:

Allow changing level of individual namespaces

Location:

uspace/srv/logger

Files:

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

uspace/srv/logger/logger.h

@@ -54 +54 @@
 void namespace_writer_detach(logging_namespace_t *);
 
+int namespace_change_level(logging_namespace_t *, log_level_t);
+
 void namespace_wait_for_reader_change(logging_namespace_t *, bool *);
 bool namespace_has_reader(logging_namespace_t *, log_level_t);

uspace/srv/logger/main.c

@@ -48 +48 @@
 #include "logger.h"
 
+static int handle_namespace_level_change(sysarg_t new_level)
+{
+        void *namespace_name;
+        int rc = async_data_write_accept(&namespace_name, true, 0, 0, 0, NULL);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        logging_namespace_t *namespace = namespace_writer_attach((const char *) namespace_name);
+        free(namespace_name);
+        if (namespace == NULL)
+                return ENOENT;
+
+        rc = namespace_change_level(namespace, (log_level_t) new_level);
+        namespace_writer_detach(namespace);
+
+        return rc;
+}
+
 static void connection_handler_control(void)
 {
@@ -67 +86 @@
                 case LOGGER_CTL_SET_DEFAULT_LEVEL:
                         rc = set_default_logging_level(IPC_GET_ARG1(call));
+                        async_answer_0(callid, rc);
+                        break;
+                case LOGGER_CTL_SET_NAMESPACE_LEVEL:
+                        rc = handle_namespace_level_change(IPC_GET_ARG1(call));
                         async_answer_0(callid, rc);
                         break;

uspace/srv/logger/namespace.c

@@ -34 +34 @@
 #include <str.h>
 #include <stdio.h>
+#include <errno.h>
 #include "logger.h"
 
@@ -198 +199 @@
 }
 
+int namespace_change_level(logging_namespace_t *namespace, log_level_t level)
+{
+        if (level >= LVL_LIMIT)
+                return ERANGE;
+
+        fibril_mutex_lock(&namespace->guard);
+        namespace->level = level;
+        fibril_condvar_broadcast(&namespace->level_changed_cv);
+        fibril_mutex_unlock(&namespace->guard);
+
+        return EOK;
+}
+
+
 bool namespace_has_reader(logging_namespace_t *namespace, log_level_t level)
 {