Changeset 793cce15 in mainline for uspace/srv/logger

Timestamp:

2012-08-16T14:22:56Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

32b26cf7

Parents:

9a53e00

Message:

Add logging contexts

Location:

uspace/srv/logger

Files:

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

uspace/srv/logger/logger.h

@@ -57 +57 @@
 
 void namespace_wait_for_reader_change(logging_namespace_t *, bool *);
-bool namespace_has_reader(logging_namespace_t *, log_level_t);
-void namespace_add_message(logging_namespace_t *, const char *, log_level_t);
+bool namespace_has_reader(logging_namespace_t *, sysarg_t, log_level_t);
+void namespace_add_message(logging_namespace_t *, const char *, sysarg_t, log_level_t);
+
+int namespace_create_context(logging_namespace_t *, const char *);
 
 log_level_t get_default_logging_level(void);

uspace/srv/logger/main.c

@@ -126 +126 @@
 }
 
-static int handle_receive_message(logging_namespace_t *namespace, int level)
-{
-        bool skip_message = !namespace_has_reader(namespace, level);
+static int handle_receive_message(logging_namespace_t *namespace, sysarg_t context, int level)
+{
+        bool skip_message = !namespace_has_reader(namespace, context, level);
         if (skip_message) {
                 /* Abort the actual message buffer transfer. */
@@ -147 +147 @@
         }
 
-        namespace_add_message(namespace, message, level);
+        namespace_add_message(namespace, message, context, level);
 
         free(message);
 
+        return EOK;
+}
+
+static int handle_create_context(logging_namespace_t *namespace, sysarg_t *idx)
+{
+        void *name;
+        int rc = async_data_write_accept(&name, true, 0, 0, 0, NULL);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        rc = namespace_create_context(namespace, name);
+
+        free(name);
+
+        if (rc < 0)
+                return rc;
+
+        *idx = (sysarg_t) rc;
         return EOK;
 }
@@ -166 +185 @@
 
                 int rc;
+                sysarg_t arg = 0;
 
                 switch (IPC_GET_IMETHOD(call)) {
+                case LOGGER_CREATE_CONTEXT:
+                        rc = handle_create_context(namespace, &arg);
+                        async_answer_1(callid, rc, arg);
+                        break;
                 case LOGGER_MESSAGE:
-                        rc = handle_receive_message(namespace, IPC_GET_ARG1(call));
+                        rc = handle_receive_message(namespace, IPC_GET_ARG1(call), IPC_GET_ARG2(call));
                         async_answer_0(callid, rc);
                         break;

uspace/srv/logger/namespace.c

@@ -41 +41 @@
  */
 
+#define CONTEXT_SIZE 16
+
+typedef struct {
+        const char *name;
+        log_level_t level;
+} logging_context_t;
 
 struct logging_namespace {
@@ -50 +56 @@
         const char *name;
 
+        // FIXME: make dynamic
+        size_t context_count;
+        logging_context_t context[CONTEXT_SIZE];
+
         link_t link;
 };
@@ -56 +66 @@
 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;
+static log_level_t namespace_get_actual_log_level(logging_namespace_t *namespace, sysarg_t context)
+{
+        fibril_mutex_lock(&namespace->guard);
+        if (context >= namespace->context_count) {
+                fibril_mutex_unlock(&namespace->guard);
+                return LVL_FATAL;
+        }
+        log_level_t level = namespace->context[context].level;
         fibril_mutex_unlock(&namespace->guard);
 
@@ -115 +129 @@
         namespace->level = LOG_LEVEL_USE_DEFAULT;
 
+        namespace->context_count = 1;
+        namespace->context[0].name = "";
+        namespace->context[0].level = LOG_LEVEL_USE_DEFAULT;
+
         fibril_mutex_initialize(&namespace->guard);
         fibril_condvar_initialize(&namespace->level_changed_cv);
@@ -206 +224 @@
         fibril_mutex_lock(&namespace->guard);
         namespace->level = level;
+        for (size_t i = 0; i < namespace->context_count; i++) {
+                namespace->context[i].level = level;
+        }
         fibril_condvar_broadcast(&namespace->level_changed_cv);
         fibril_mutex_unlock(&namespace->guard);
@@ -213 +234 @@
 
 
-bool namespace_has_reader(logging_namespace_t *namespace, log_level_t level)
-{
-        return level <= namespace_get_actual_log_level(namespace);
+bool namespace_has_reader(logging_namespace_t *namespace, sysarg_t context, log_level_t level)
+{
+        return level <= namespace_get_actual_log_level(namespace, context);
+}
+
+int namespace_create_context(logging_namespace_t *namespace, const char *name)
+{
+        int rc;
+        fibril_mutex_lock(&namespace->guard);
+        if (namespace->context_count >= CONTEXT_SIZE) {
+                rc = ELIMIT;
+                goto leave;
+        }
+
+        namespace->context[namespace->context_count].level
+            = LOG_LEVEL_USE_DEFAULT;
+        namespace->context[namespace->context_count].name
+            = str_dup(name);
+        if (namespace->context[namespace->context_count].name == NULL) {
+                rc = ENOMEM;
+                goto leave;
+        }
+        rc = (int) namespace->context_count;
+        namespace->context_count++;
+
+
+leave:
+        fibril_mutex_unlock(&namespace->guard);
+        return rc;
 }
 
@@ -230 +277 @@
 
 
-void namespace_add_message(logging_namespace_t *namespace, const char *message, log_level_t level)
-{
-        if (level <= namespace_get_actual_log_level(namespace)) {
+void namespace_add_message(logging_namespace_t *namespace, const char *message, sysarg_t context, log_level_t level)
+{
+        if (level <= namespace_get_actual_log_level(namespace, context)) {
                 const char *level_name = log_level_str(level);
-                printf("[%s %s]: %s\n", namespace->name, level_name, message);
-                fprintf(namespace->logfile, "%s: %s\n", level_name, message);
+                if (context == 0) {
+                        printf("[%s %s]: %s\n",
+                            namespace->name, level_name, message);
+                        fprintf(namespace->logfile, "%s: %s\n",
+                            level_name, message);
+                } else {
+                        const char *context_name = namespace->context[context].name;
+                        printf("[%s/%s %s]: %s\n",
+                            namespace->name, context_name, level_name, message);
+                        fprintf(namespace->logfile, "[%s] %s: %s\n",
+                            context_name, level_name, message);
+                }
                 fflush(namespace->logfile);
                 fflush(stdout);