Changeset 2bf781a in mainline

Timestamp:

2012-08-16T21:50:52Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f50a756

Parents:

cba45af

Message:

Pretend logs form a tree hierarchy

Location:

uspace

Files:

• app/tester/stdio/logger2.c (modified) (2 diffs)
• lib/c/generic/io/log.c (modified) (6 diffs)
• lib/c/include/io/log.h (modified) (1 diff)

uspace/app/tester/stdio/logger2.c

@@ -36 +36 @@
 const char *test_logger2(void)
 {
-        log_t log_alpha = log_create("alpha");
-        log_t log_bravo = log_create("bravo");
+        log_t log_alpha = log_create("alpha", LOG_DEFAULT);
+        log_t log_bravo = log_create("bravo", log_alpha);
 
-        TPRINTF("Alpha context is %" PRIlogctx ".\n", log_alpha);
-        TPRINTF("Bravo context is %" PRIlogctx ".\n", log_bravo);
+        TPRINTF("Alpha is %" PRIlogctx ".\n", log_alpha);
+        TPRINTF("Bravo is %" PRIlogctx ".\n", log_bravo);
 
         while (true) {
@@ -54 +54 @@
                             (int) level, log_level_str(level));
                         log_log_msg(log_bravo, level,
-                            "Printing level %d (%s) into bravo log.",
+                            "Printing level %d (%s) into bravo sub-log.",
                             (int) level, log_level_str(level));
                         async_usleep(1000 * 100);

uspace/lib/c/generic/io/log.c

@@ -43 +43 @@
 #include <ns.h>
 
+typedef struct {
+        char *name;
+        sysarg_t top_log_id;
+        sysarg_t log_id;
+} log_info_t;
+
+static log_info_t default_log = {
+        .name = NULL,
+        .top_log_id = 0,
+        .log_id = 0
+};
+
+static sysarg_t default_top_log_id;
+
 /** Log messages are printed under this name. */
 static const char *log_prog_name;
@@ -62 +76 @@
 #define MESSAGE_BUFFER_SIZE 4096
 
-static sysarg_t toplog_id;
 
 static int logger_register(async_sess_t *session, const char *prog_name)
@@ -86 +99 @@
                 return reg_msg_rc;
 
-        toplog_id = IPC_GET_ARG1(answer);
+        default_top_log_id = IPC_GET_ARG1(answer);
+        default_log.top_log_id = default_top_log_id;
 
         return EOK;
@@ -97 +111 @@
                 return ENOMEM;
         }
+        log_info_t *log_info = ctx != 0 ? (log_info_t *) ctx : &default_log;
 
         aid_t reg_msg = async_send_3(exchange, LOGGER_WRITER_MESSAGE,
-            toplog_id, ctx, level, NULL);
+            log_info->top_log_id, log_info->log_id, level, NULL);
         int rc = async_data_write_start(exchange, message, str_size(message));
         sysarg_t reg_msg_rc;
@@ -184 +199 @@
  * This function always returns a valid context.
  */
-log_t log_create(const char *name)
-{
+log_t log_create(const char *name, log_t parent)
+{
+        log_info_t *info = malloc(sizeof(log_info_t));
+        if (info == NULL)
+                return LOG_DEFAULT;
+
+        if (parent == LOG_DEFAULT) {
+                info->name = str_dup(name);
+                if (info->name == NULL) {
+                        free(info);
+                        return LOG_DEFAULT;
+                }
+                info->top_log_id = default_top_log_id;
+        } else {
+                log_info_t *parent_info = (log_info_t *) parent;
+                int rc = asprintf(&info->name, "%s/%s",
+                    parent_info->name, name);
+                if (rc < 0) {
+                        free(info);
+                        return LOG_DEFAULT;
+                }
+                info->top_log_id = parent_info->top_log_id;
+        }
+
         async_exch_t *exchange = async_exchange_begin(logger_session);
         if (exchange == NULL)
-                return LOG_DEFAULT;
+                goto error;
 
         ipc_call_t answer;
-        aid_t reg_msg = async_send_1(exchange, LOGGER_WRITER_CREATE_SUB_LOG, toplog_id, &answer);
-        int rc = async_data_write_start(exchange, name, str_size(name));
+        aid_t reg_msg = async_send_1(exchange, LOGGER_WRITER_CREATE_SUB_LOG,
+            info->top_log_id, &answer);
+        int rc = async_data_write_start(exchange, info->name, str_size(info->name));
         sysarg_t reg_msg_rc;
         async_wait_for(reg_msg, &reg_msg_rc);
@@ -199 +237 @@
 
         if ((rc != EOK) || (reg_msg_rc != EOK))
-                return LOG_DEFAULT;
-
-        return IPC_GET_ARG1(answer);
+                goto error;
+
+        info->log_id = IPC_GET_ARG1(answer);
+        return (sysarg_t) info;
+
+error:
+        free(info->name);
+        free(info);
+        return LOG_DEFAULT;
 }
 

uspace/lib/c/include/io/log.h

@@ -59 +59 @@
 
 extern int log_init(const char *, log_level_t);
-
-extern log_t log_create(const char *);
+extern log_t log_create(const char *, log_t);
 
 #define log_msg(level, format, ...) \