Changeset 76d92db1 in mainline

Timestamp:

2012-08-14T09:37:42Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

cddcc4a3

Parents:

14de4106

Message:

Log to file as well

Location:

uspace/srv/logger

Files:

• logger.h (modified) (2 diffs)
• main.c (modified) (1 diff)
• namespace.c (modified) (6 diffs)

uspace/srv/logger/logger.h

@@ -42 +42 @@
 #include <fibril_synch.h>
 
-#define DEFAULT_LOGGING_LEVEL LVL_WARN
+#define DEFAULT_LOGGING_LEVEL LVL_NOTE
 
 #define NAME "logger"
@@ -67 +67 @@
 
 void namespace_wait_for_reader_change(logging_namespace_t *, bool *);
-bool namespace_has_reader(logging_namespace_t *);
+bool namespace_has_reader(logging_namespace_t *, log_level_t);
 void namespace_add_message(logging_namespace_t *, const char *, log_level_t);
 log_message_t *namespace_get_next_message(logging_namespace_t *);

uspace/srv/logger/main.c

@@ -74 +74 @@
 static int handle_receive_message(logging_namespace_t *namespace, int level)
 {
-        bool skip_message = (level > DEFAULT_LOGGING_LEVEL) && !namespace_has_reader(namespace);
+        bool skip_message = (level > DEFAULT_LOGGING_LEVEL) && !namespace_has_reader(namespace, level);
         if (skip_message) {
                 /* Abort the actual message buffer transfer. */

uspace/srv/logger/namespace.c

@@ -40 +40 @@
  */
 
+
 struct logging_namespace {
         fibril_mutex_t guard;
@@ -45 +46 @@
         fibril_condvar_t reader_appeared_cv;
         bool has_reader;
+        FILE *logfile;
+        log_level_t logfile_level;
         const char *name;
         link_t link;
@@ -107 +110 @@
                 return NULL;
         }
+
+        char *logfilename;
+        int rc = asprintf(&logfilename, "/log/%s", name);
+        if (rc < 0) {
+                free(namespace->name);
+                free(namespace);
+                return NULL;
+        }
+        namespace->logfile = fopen(logfilename, "a");
+        free(logfilename);
+        if (namespace->logfile == NULL) {
+                free(namespace->name);
+                free(namespace);
+                return NULL;
+        }
+
+        namespace->logfile_level = DEFAULT_LOGGING_LEVEL;
 
         fibril_mutex_initialize(&namespace->guard);
@@ -153 +173 @@
 
         // TODO - destroy pending messages
+        fclose(namespace->logfile);
         free(namespace->name);
         free(namespace);
@@ -223 +244 @@
 }
 
-bool namespace_has_reader(logging_namespace_t *namespace)
-{
-        fibril_mutex_lock(&namespace->guard);
-        bool has_reader = namespace->has_reader;
+bool namespace_has_reader(logging_namespace_t *namespace, log_level_t level)
+{
+        fibril_mutex_lock(&namespace->guard);
+        bool has_reader = namespace->has_reader
+            || level <= namespace->logfile_level;
         fibril_mutex_unlock(&namespace->guard);
         return has_reader;
@@ -247 +269 @@
         if (level <= DEFAULT_LOGGING_LEVEL) {
                 printf("[%s %d]: %s\n", namespace->name, level, message);
+        }
+        if (level <= namespace->logfile_level) {
+                fprintf(namespace->logfile, "[%d]: %s\n", level, message);
+                fflush(namespace->logfile);
         }