Changes in uspace/lib/usb/src/debug.c [bb95594:ef7f043] in mainline

File:

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

uspace/lib/usb/src/debug.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2010-2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libusb usb
+/** @addtogroup libusb
  * @{
  */
@@ -60 +60 @@
 /** Mutex guard for the list of all tags. */
 static FIBRIL_MUTEX_INITIALIZE(tag_list_guard);
+
+/** Level of logging messages. */
+static usb_log_level_t log_level = USB_LOG_LEVEL_WARNING;
+/** Prefix for logging messages. */
+static const char *log_prefix = "usb";
+/** Serialization mutex for logging functions. */
+static FIBRIL_MUTEX_INITIALIZE(log_serializer);
+static FILE *log_stream = NULL;
 
 /** Find or create new tag with given name.
@@ -155 +163 @@
 }
 
+/** Enable logging.
+ *
+ * @param level Maximal enabled level (including this one).
+ * @param message_prefix Prefix for each printed message.
+ */
+void usb_log_enable(usb_log_level_t level, const char *message_prefix)
+{
+        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);
+                }
+        }
+}
+
+
+static const char *log_level_name(usb_log_level_t level)
+{
+        switch (level) {
+                case USB_LOG_LEVEL_FATAL:
+                        return " FATAL";
+                case USB_LOG_LEVEL_ERROR:
+                        return " ERROR";
+                case USB_LOG_LEVEL_WARNING:
+                        return " WARN";
+                case USB_LOG_LEVEL_INFO:
+                        return " info";
+                default:
+                        return "";
+        }
+}
+
+/** Print logging message.
+ *
+ * @param level Verbosity level of the message.
+ * @param format Formatting directive.
+ */
+void usb_log_printf(usb_log_level_t level, const char *format, ...)
+{
+        FILE *screen_stream = NULL;
+        switch (level) {
+                case USB_LOG_LEVEL_FATAL:
+                case USB_LOG_LEVEL_ERROR:
+                        screen_stream = stderr;
+                        break;
+                default:
+                        screen_stream = stdout;
+                        break;
+        }
+        assert(screen_stream != NULL);
+
+        va_list args;
+
+        /*
+         * 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);
+
+        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);
+}
 
 /**