Changeset a887bd1 in mainline

Timestamp:

2011-02-04T12:12:47Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ff244e6

Parents:

3597dab (diff), 9f5667a (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: minor fixes and improvements

Location:

uspace/lib/usb/src

Files:

• addrkeep.c (modified) (1 diff)
• debug.c (modified) (4 diffs)

uspace/lib/usb/src/addrkeep.c

@@ -149 +149 @@
                         &addresses->default_condvar_guard);
         }
+        addresses->default_available = false;
         fibril_mutex_unlock(&addresses->default_condvar_guard);
 }

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;
         switch (level) {
@@ -216 +221 @@
         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) {
+                fprintf(log_stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(log_stream, format, args);
+        }
+
+        if (level <= log_level) {
+                fprintf(stream, "[%s]%s: ", log_prefix, level_name);
+                vfprintf(stream, format, args);
+        }
+
         fibril_mutex_unlock(&log_serializer);