Changeset cd50486 in mainline for uspace/lib/usb/src/debug.c

Timestamp:

2011-02-06T22:03:55Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

25971d2

Parents:

1110ebd (diff), 960ff451 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• uspace/lib/usb/src/debug.c (modified) (3 diffs)

uspace/lib/usb/src/debug.c

@@ -67 +67 @@
 /** Serialization mutex for logging functions. */
 static FIBRIL_MUTEX_INITIALIZE(log_serializer);
+static FILE *log_stream = NULL;
 
 /** Find or create new tag with given name.
@@ -171 +172 @@
         log_prefix = message_prefix;
         log_level = level;
+        if (log_stream == NULL) {
+                char *fname;
+                int rc = asprintf(&fname, "/log/%s", message_prefix);
+                if (rc > 0) {
+                        log_stream = fopen(fname, "w");
+                        free(fname);
+                }
+        }
 }
 
@@ -197 +206 @@
 void usb_log_printf(usb_log_level_t level, const char *format, ...)
 {
-        if (level > log_level) {
-                return;
-        }
-
-        FILE *stream = NULL;
+        FILE *screen_stream = NULL;
         switch (level) {
                 case USB_LOG_LEVEL_FATAL:
                 case USB_LOG_LEVEL_ERROR:
-                        stream = stderr;
+                        screen_stream = stderr;
                         break;
                 default:
-                        stream = stdout;
+                        screen_stream = stdout;
                         break;
         }
-        assert(stream != NULL);
+        assert(screen_stream != NULL);
 
         va_list args;
-        va_start(args, format);
-
+
+        /*
+         * Serialize access to log files.
+         * Always print to log file, to screen print only when the enabled
+         * log level is high enough.
+         */
         fibril_mutex_lock(&log_serializer);
-        fprintf(stream, "[%s]%s: ", log_prefix, log_level_name(level));
-        vfprintf(stream, format, args);
+
+        const char *level_name = log_level_name(level);
+
+        if (log_stream != NULL) {
+                va_start(args, format);
+
+                fprintf(log_stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(log_stream, format, args);
+                fflush(log_stream);
+
+                va_end(args);
+        }
+
+        if (level <= log_level) {
+                va_start(args, format);
+
+                fprintf(screen_stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(screen_stream, format, args);
+                fflush(screen_stream);
+
+                va_end(args);
+        }
+
         fibril_mutex_unlock(&log_serializer);
-
-        va_end(args);
 }