Changeset fc51296 in mainline for uspace/lib

Timestamp:

2011-03-31T17:37:25Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3acb285a

Parents:

9b415c9

Message:

Add logging for device drivers.

Location:

uspace/lib

Files:

• c/generic/io/log.c (modified) (3 diffs)
• c/include/io/log.h (modified) (2 diffs)
• drv/Makefile (modified) (1 diff)
• drv/generic/driver.c (modified) (1 diff)
• drv/generic/log.c (added)
• drv/include/ddf/log.h (added)

uspace/lib/c/generic/io/log.c

@@ -35 +35 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -89 +90 @@
         va_list args;
 
+        va_start(args, fmt);
+        log_msgv(level, fmt, args);
+        va_end(args);
+}
+
+/** Write an entry to the log (va_list variant).
+ *
+ * @param level         Message verbosity level. Message is only printed
+ *                      if verbosity is less than or equal to current
+ *                      reporting level.
+ * @param fmt           Format string
+ */
+void log_msgv(log_level_t level, const char *fmt, va_list args)
+{
         assert(level < LVL_LIMIT);
 
         /* Higher number means higher verbosity. */
         if (level <= log_level) {
-                va_start(args, fmt);
                 fibril_mutex_lock(&log_serializer);
 
-                fprintf(log_stream, "%s: %s", log_prog_name,
+                fprintf(log_stream, "%s: %s: ", log_prog_name,
                     log_level_names[level]);
                 vfprintf(log_stream, fmt, args);
@@ -102 +116 @@
 
                 fibril_mutex_unlock(&log_serializer);
-                va_end(args);
         }
 }

uspace/lib/c/include/io/log.h

@@ -35 +35 @@
 #define LIBC_IO_LOG_H_
 
+#include <stdarg.h>
+
 typedef enum {
         LVL_FATAL,
@@ -49 +51 @@
 extern int log_init(const char *, log_level_t);
 extern void log_msg(log_level_t, const char *, ...);
+extern void log_msgv(log_level_t, const char *, va_list);
 
 #endif

uspace/lib/drv/Makefile

@@ -35 +35 @@
         generic/driver.c \
         generic/dev_iface.c \
+        generic/log.c \
         generic/remote_hw_res.c \
         generic/remote_char_dev.c

uspace/lib/drv/generic/driver.c

@@ -273 +273 @@
         
         res = driver->driver_ops->add_device(dev);
-        if (res == EOK) {
-                printf("%s: new device with handle=%" PRIun " was added.\n",
-                    driver->name, dev_handle);
-        } else {
-                printf("%s: failed to add a new device with handle = %" PRIun ".\n",
-                    driver->name, dev_handle);
+        if (res != EOK)
                 delete_device(dev);
-        }
         
         async_answer_0(iid, res);