Changeset f039dba in mainline for uspace/srv/logger/ctl.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/ctl.c (modified) (2 diffs)

uspace/srv/logger/ctl.c

@@ -43 +43 @@
 #include "logger.h"
 
-static int handle_toplog_level_change(sysarg_t new_level)
+static int handle_log_level_change(sysarg_t new_level)
 {
-        void *top_name;
-        int rc = async_data_write_accept(&top_name, true, 0, 0, 0, NULL);
+        void *full_name;
+        int rc = async_data_write_accept(&full_name, true, 0, 0, 0, NULL);
         if (rc != EOK) {
                 return rc;
         }
 
-        logger_toplevel_log_t *toplog = find_or_create_toplevel_log(top_name);
-        free(top_name);
-        if (toplog == NULL)
+        logger_log_t *log = find_log_by_name(full_name);
+        free(full_name);
+        if (log == NULL)
                 return ENOENT;
 
-        toplog->logged_level = new_level;
+        log->logged_level = new_level;
 
         return EOK;
-}
-
-static int handle_log_level_change(sysarg_t new_level)
-{
-        void *top_name;
-        int rc = async_data_write_accept(&top_name, true, 0, 0, 0, NULL);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        logger_toplevel_log_t *toplog = find_or_create_toplevel_log(top_name);
-        free(top_name);
-        if (toplog == NULL)
-                return ENOENT;
-
-
-        void *log_name;
-        rc = async_data_write_accept(&log_name, true, 0, 0, 0, NULL);
-        if (rc != EOK)
-                return rc;
-
-        rc = ENOENT;
-        for (size_t i = 0; i < toplog->sublog_count; i++) {
-                if (str_cmp(toplog->sublogs[i].name, (const char *) log_name) == 0) {
-                        toplog->sublogs[i].logged_level = new_level;
-                        rc = EOK;
-                        break;
-                }
-        }
-
-        free(log_name);
-
-        return rc;
 }
 
@@ -109 +76 @@
                 case LOGGER_CTL_SET_DEFAULT_LEVEL: {
                         int rc = set_default_logging_level(IPC_GET_ARG1(call));
-                        async_answer_0(callid, rc);
-                        break;
-                }
-                case LOGGER_CTL_SET_TOP_LOG_LEVEL: {
-                        int rc = handle_toplog_level_change(IPC_GET_ARG1(call));
                         async_answer_0(callid, rc);
                         break;