Changeset 669f5cae in mainline

Timestamp:

2012-08-16T08:44:34Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6e9e12b

Parents:

cddcc4a3

Message:

Allow setting default log level

Currently, it does not affect existing clients.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/logset/Makefile (added)
• uspace/app/logset/main.c (added)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/generic/io/logctl.c (added)
• uspace/lib/c/include/io/logctl.h (added)
• uspace/lib/c/include/ipc/logger.h (modified) (2 diffs)
• uspace/srv/logger/Makefile (modified) (1 diff)
• uspace/srv/logger/logger.h (modified) (2 diffs)
• uspace/srv/logger/main.c (modified) (3 diffs)
• uspace/srv/logger/namespace.c (modified) (2 diffs)

boot/Makefile.common

@@ -166 +166 @@
         $(USPACE_PATH)/app/loc/loc \
         $(USPACE_PATH)/app/logview/logview \
+        $(USPACE_PATH)/app/logset/logset \
         $(USPACE_PATH)/app/mkfat/mkfat \
         $(USPACE_PATH)/app/mkexfat/mkexfat \

uspace/Makefile

@@ -47 +47 @@
         app/klog \
         app/loc \
+        app/logset \
         app/logview \
         app/mkfat \

uspace/lib/c/Makefile

@@ -97 +97 @@
         generic/io/printf.c \
         generic/io/log.c \
+        generic/io/logctl.c \
         generic/io/klog.c \
         generic/io/snprintf.c \

uspace/lib/c/include/ipc/logger.h

@@ -37 +37 @@
 
 typedef enum {
+        LOGGER_CTL_GET_DEFAULT_LEVEL = IPC_FIRST_USER_METHOD,
+        LOGGER_CTL_SET_DEFAULT_LEVEL
+} logger_control_request_t;
+
+typedef enum {
         LOGGER_REGISTER = IPC_FIRST_USER_METHOD,
         LOGGER_MESSAGE,
@@ -48 +53 @@
 
 typedef enum {
+        /** Interface for controlling logger behavior. */
+        LOGGER_INTERFACE_CONTROL,
         /** Interface for servers writing to the log. */
         LOGGER_INTERFACE_SINK,

uspace/srv/logger/Makefile

@@ -32 +32 @@
 
 SOURCES = \
+        level.c \
         main.c \
         namespace.c

uspace/srv/logger/logger.h

@@ -42 +42 @@
 #include <fibril_synch.h>
 
-#define DEFAULT_LOGGING_LEVEL LVL_NOTE
-
 #define NAME "logger"
 #define MAX_NAMESPACE_LENGTH 256
@@ -71 +69 @@
 log_message_t *namespace_get_next_message(logging_namespace_t *);
 
+log_level_t get_default_logging_level(void);
+int set_default_logging_level(log_level_t);
+
 #endif
 

uspace/srv/logger/main.c

@@ -47 +47 @@
 #include "logger.h"
 
+static void connection_handler_control(void)
+{
+        printf(NAME "/control: new client.\n");
+
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+
+                int rc;
+
+                switch (IPC_GET_IMETHOD(call)) {
+                case LOGGER_CTL_GET_DEFAULT_LEVEL:
+                        async_answer_1(callid, EOK, get_default_logging_level());
+                        break;
+                case LOGGER_CTL_SET_DEFAULT_LEVEL:
+                        rc = set_default_logging_level(IPC_GET_ARG1(call));
+                        async_answer_0(callid, rc);
+                        break;
+                default:
+                        async_answer_0(callid, EINVAL);
+                        break;
+                }
+        }
+
+        printf(NAME "/control: client terminated.\n");
+}
+
 static logging_namespace_t *find_namespace_and_attach_writer(void)
 {
@@ -74 +104 @@
 static int handle_receive_message(logging_namespace_t *namespace, int level)
 {
-        bool skip_message = (level > DEFAULT_LOGGING_LEVEL) && !namespace_has_reader(namespace, level);
+        bool skip_message = (level > (int)get_default_logging_level()) && !namespace_has_reader(namespace, level);
         if (skip_message) {
                 /* Abort the actual message buffer transfer. */
@@ -221 +251 @@
 
         switch (iface) {
+        case LOGGER_INTERFACE_CONTROL:
+                async_answer_0(iid, EOK);
+                connection_handler_control();
+                break;
         case LOGGER_INTERFACE_SINK:
                 /* First call has to be the registration. */

uspace/srv/logger/namespace.c

@@ -126 +126 @@
         }
 
-        namespace->logfile_level = DEFAULT_LOGGING_LEVEL;
+        namespace->logfile_level = get_default_logging_level();
 
         fibril_mutex_initialize(&namespace->guard);
@@ -267 +267 @@
 void namespace_add_message(logging_namespace_t *namespace, const char *message, log_level_t level)
 {
-        if (level <= DEFAULT_LOGGING_LEVEL) {
+        if (level <= get_default_logging_level()) {
                 printf("[%s %d]: %s\n", namespace->name, level, message);
         }