Changeset 20dd67e in mainline

Timestamp:

2012-08-17T13:40:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

920d0fc

Parents:

267f235

Message:

USB logging uses standard logging

Location:

uspace/lib/usb

Files:

• include/usb/debug.h (modified) (3 diffs)
• src/debug.c (modified) (3 diffs)

uspace/lib/usb/include/usb/debug.h

@@ -38 +38 @@
 #include <inttypes.h>
 #include <usb/usb.h>
+#include <io/log.h>
 #include <assert.h>
 
@@ -43 +44 @@
     const uint8_t *, size_t);
 
-/** Logging level. */
-typedef enum {
-        /** Fatal, unrecoverable, error.
-         * Such error prevents the driver from working at all.
-         */
-        USB_LOG_LEVEL_FATAL,
-
-        /** Serious but recoverable error
-         * Shall be used for errors fatal for single device but not for
-         * driver itself.
-         */
-        USB_LOG_LEVEL_ERROR,
-
-        /** Warning.
-         * Problems from which the driver is able to recover gracefully.
-         */
-        USB_LOG_LEVEL_WARNING,
-
-        /** Information message.
-         * This should be the last level that is printed by default to
-         * the screen.
-         * Typical usage is to inform that new device was found and what
-         * are its capabilities.
-         * Do not use for repetitive actions (such as device polling).
-         */
-        USB_LOG_LEVEL_INFO,
-
-        /** Debugging message. */
-        USB_LOG_LEVEL_DEBUG,
-
-        /** More detailed debugging message. */
-        USB_LOG_LEVEL_DEBUG2,
-
-        /** Terminating constant for logging levels. */
-        USB_LOG_LEVEL_MAX
-} usb_log_level_t;
+#define USB_LOG_LEVEL_FATAL LVL_FATAL
+#define USB_LOG_LEVEL_ERROR LVL_ERROR
+#define USB_LOG_LEVEL_WARNING LVL_WARN
+#define USB_LOG_LEVEL_INFO LVL_NOTE
+#define USB_LOG_LEVEL_DEBUG LVL_DEBUG
+#define USB_LOG_LEVEL_DEBUG2 LVL_DEBUG2
 
 /** Default log level. */
@@ -87 +58 @@
 #endif
 
-void usb_log_enable(usb_log_level_t, const char *);
+void usb_log_enable(log_level_t , const char *);
 
-void usb_log_printf(usb_log_level_t, const char *, ...)
+void usb_log_printf(log_level_t, const char *, ...)
         PRINTF_ATTRIBUTE(2, 3);
 

uspace/lib/usb/src/debug.c

@@ -41 +41 @@
 #include <usb/debug.h>
 
-/** 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);
-
-/** File where to store the log. */
-static FILE *log_stream = NULL;
-
-
 /** Enable logging.
  *
@@ -59 +46 @@
  * @param message_prefix Prefix for each printed message.
  */
-void usb_log_enable(usb_log_level_t level, const char *message_prefix)
+void usb_log_enable(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");
-                        if (log_stream != NULL)
-                                setvbuf(log_stream, NULL, _IOFBF, BUFSIZ);
-                        
-                        free(fname);
-                }
-        }
         log_init(message_prefix);
-}
-
-/** Get log level name prefix.
- *
- * @param level Log level.
- * @return String prefix for the message.
- */
-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 "";
-        }
 }
 
@@ -103 +56 @@
  * @param format Formatting directive.
  */
-void usb_log_printf(usb_log_level_t level, const char *format, ...)
+void usb_log_printf(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.
-         * Print to screen only messages with higher level than the one
-         * specified during logging initialization.
-         * Print also to file, to it print one more (lower) level as well.
-         */
-        fibril_mutex_lock(&log_serializer);
-
-        const char *level_name = log_level_name(level);
-
-        if ((log_stream != NULL) && (level <= log_level + 1)) {
-                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);
-        }
 
         va_start(args, format);
         log_msgv(level, format, args);
         va_end(args);
-
-        fibril_mutex_unlock(&log_serializer);
 }