Changeset fd07e57b in mainline for uspace/lib/c/include

Timestamp:

2014-01-05T21:25:41Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

4aa2a27

Parents:

aacdb8e (diff), ca05e9b (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 cherrypicked kernel logger.

• Old klog sybsystem was renamed to kio
• Kernel and user-space log messages are stored in both logs (kernel logs end up in log/kernel file)

Location:

uspace/lib/c/include

Files:

• io/kio.h (added)
• io/klog.h (modified) (2 diffs)
• io/log.h (modified) (1 diff)
• stdio.h (modified) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Vana
+ * Copyright (c) 2013 Martin Sucha
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <stdarg.h>
 #include <io/verify.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <str.h>
+#include <abi/log.h>
 
-extern size_t klog_write(const void *, size_t);
-extern void klog_update(void);
-extern void klog_command(const void *, size_t);
-extern int klog_printf(const char *, ...)
-    PRINTF_ATTRIBUTE(1, 2);
-extern int klog_vprintf(const char *, va_list);
+extern size_t klog_write(log_level_t, const void *, size_t);
+extern int klog_read(void *, size_t);
+
+#define KLOG_PRINTF(lvl, fmt, ...) ({ \
+        char *_fmt = str_dup(fmt); \
+        size_t _fmtsize = str_size(_fmt); \
+        if (_fmtsize > 0 && _fmt[_fmtsize - 1] == '\n') \
+                _fmt[_fmtsize - 1] = 0; \
+        char *_s; \
+        int _c = asprintf(&_s, _fmt, ##__VA_ARGS__); \
+        free(_fmt); \
+        if (_c >= 0) { \
+                _c = klog_write((lvl), _s, str_size(_s)); \
+                free(_s); \
+        }; \
+        (_c >= 0); \
+})
 
 #endif

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

@@ -39 +39 @@
 #include <io/verify.h>
 
-/** Log message level. */
-typedef enum {
-        /** Fatal error, program is not able to recover at all. */
-        LVL_FATAL,
-        /** Serious error but the program can recover from it. */
-        LVL_ERROR,
-        /** Easily recoverable problem. */
-        LVL_WARN,
-        /** Information message that ought to be printed by default. */
-        LVL_NOTE,
-        /** Debugging purpose message. */
-        LVL_DEBUG,
-        /** More detailed debugging message. */
-        LVL_DEBUG2,
-        
-        /** For checking range of values */
-        LVL_LIMIT
-} log_level_t;
+#include <abi/log.h>
 
 /** Log itself (logging target). */

uspace/lib/c/include/stdio.h

@@ -40 +40 @@
 #include <str.h>
 #include <io/verify.h>
-#include <abi/klog.h>
+#include <abi/kio.h>
 
 #define EOF  (-1)
@@ -52 +52 @@
                 int _n = snprintf(_buf, sizeof(_buf), fmt, ##__VA_ARGS__); \
                 if (_n > 0) \
-                        (void) __SYSCALL3(SYS_KLOG, KLOG_WRITE, (sysarg_t) _buf, str_size(_buf)); \
+                        (void) __SYSCALL3(SYS_KIO, KIO_WRITE, (sysarg_t) _buf, str_size(_buf)); \
         }