Changeset f039dba in mainline for uspace/srv/logger/writer.c

Timestamp:

2012-08-17T09:57:27Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b1912b0c

Parents:

f72ae3b

Message:

Logger also works with hierarchy

File:

• uspace/srv/logger/writer.c (modified) (7 diffs)

uspace/srv/logger/writer.c

@@ -49 +49 @@
 
 
-static logger_toplevel_log_t *handle_create_toplevel_log(void)
+static logger_log_t *handle_create_log(sysarg_t parent)
 {
         void *name;
@@ -56 +56 @@
                 return NULL;
 
-        logger_toplevel_log_t *log = find_or_create_toplevel_log(name);
+        logger_log_t *log = find_or_create_log(name, parent);
 
         free(name);
@@ -63 +63 @@
 }
 
-static int handle_receive_message(sysarg_t toplevel_log_id, sysarg_t log_id, sysarg_t level)
+static int handle_receive_message(sysarg_t log_id, sysarg_t level)
 {
-        logger_toplevel_log_t *log = find_toplevel_log(toplevel_log_id);
+        logger_log_t *log = find_log_by_id(log_id);
         if (log == NULL)
-                return ENOENT;
-
-        if (log_id > log->sublog_count)
                 return ENOENT;
 
@@ -77 +74 @@
                 return rc;
 
-        if (!shall_log_message(log, log_id, level)) {
+        if (!shall_log_message(log, level)) {
                 free(message);
                 return EOK;
         }
 
-        printf("[%s/%s] %s: %s\n",
-            log->name, log->sublogs[log_id].name,
-            log_level_str(level),
+        printf("[%s] %s: %s\n",
+            log->full_name, log_level_str(level),
             (const char *) message);
 
@@ -90 +86 @@
 
         return EOK;
-}
-
-static int handle_create_sub_log(sysarg_t toplevel_log_id, sysarg_t *log_id)
-{
-        logger_toplevel_log_t *log = find_toplevel_log(toplevel_log_id);
-        if (log == NULL)
-                return ENOENT;
-
-        void *name;
-        int rc = async_data_write_accept(&name, true, 0, 0, 0, NULL);
-        if (rc != EOK)
-                return rc;
-
-        rc = add_sub_log(log, name, log_id);
-
-        free(name);
-
-        return rc;
 }
 
@@ -125 +103 @@
 
                 switch (IPC_GET_IMETHOD(call)) {
-                case LOGGER_WRITER_CREATE_TOPLEVEL_LOG: {
-                        logger_toplevel_log_t *log = handle_create_toplevel_log();
+                case LOGGER_WRITER_CREATE_LOG: {
+                        logger_log_t *log = handle_create_log(IPC_GET_ARG1(call));
                         if (log == NULL) {
                                 async_answer_0(callid, ENOMEM);
@@ -136 +114 @@
                 case LOGGER_WRITER_MESSAGE: {
                         int rc = handle_receive_message(IPC_GET_ARG1(call),
-                            IPC_GET_ARG2(call), IPC_GET_ARG3(call));
+                            IPC_GET_ARG2(call));
                         async_answer_0(callid, rc);
-                        break;
-                }
-                case LOGGER_WRITER_CREATE_SUB_LOG: {
-                        sysarg_t log_id;
-                        int rc = handle_create_sub_log(IPC_GET_ARG1(call), &log_id);
-                        async_answer_1(callid, rc, log_id);
                         break;
                 }