Changeset 91db0280 in mainline

Timestamp:

2014-01-05T19:59:56Z (10 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

927cd9c

Parents:

6fa9a99d

Message:

Cherrypick kernel logging facility

Files:

• abi/include/abi/ipc/event.h (modified) (1 diff)
• abi/include/abi/klog.h (added)
• abi/include/abi/log.h (added)
• kernel/Makefile (modified) (1 diff)
• kernel/generic/include/console/console.h (modified) (2 diffs)
• kernel/generic/include/debug.h (modified) (1 diff)
• kernel/generic/include/log.h (added)
• kernel/generic/src/console/console.c (modified) (3 diffs)
• kernel/generic/src/log/log.c (added)
• kernel/generic/src/main/main.c (modified) (2 diffs)
• uspace/lib/c/generic/io/klog.c (added)
• uspace/lib/c/include/io/klog.h (added)
• uspace/lib/c/include/io/log.h (modified) (1 diff)

abi/include/abi/ipc/event.h

@@ -44 +44 @@
         /** A task/thread has faulted and will be terminated */
         EVENT_FAULT,
+        /** New data available in kernel log */
+        EVENT_KLOG,
         EVENT_END
 } event_type_t;

kernel/Makefile

@@ -212 +212 @@
         generic/src/debug/debug.c \
         generic/src/interrupt/interrupt.c \
+        generic/src/log/log.c \
         generic/src/main/main.c \
         generic/src/main/kinit.c \

kernel/generic/include/console/console.h

@@ -39 +39 @@
 #include <print.h>
 #include <console/chardev.h>
+#include <synch/spinlock.h>
 
 #define PAGING(counter, increment, before, after) \
@@ -64 +65 @@
 extern void kio_init(void);
 extern void kio_update(void *);
+extern void kio_flush(void);
+extern void kio_push_char(const wchar_t);
+SPINLOCK_EXTERN(kio_lock);
 
 extern wchar_t getc(indev_t *indev);

kernel/generic/include/debug.h

@@ -107 +107 @@
 #define LOG(format, ...) \
         do { \
-                printf("%s() from %s at %s:%u: " format "\n", __func__, \
+                log(LF_OTHER, LVL_DEBUG, \
+                    "%s() from %s at %s:%u: " format,__func__, \
                     symtab_fmt_name_lookup(CALLER), __FILE__, __LINE__, \
                     ##__VA_ARGS__); \

kernel/generic/src/console/console.c

@@ -76 +76 @@
 
 /** Kernel log spinlock */
-SPINLOCK_STATIC_INITIALIZE_NAME(kio_lock, "kio_lock");
+SPINLOCK_INITIALIZE_NAME(kio_lock, "kio_lock");
 
 /** Physical memory area used for kio buffer */
@@ -263 +263 @@
 }
 
-void putchar(const wchar_t ch)
+/** Flush characters that are stored in the output buffer
+ * 
+ */
+void kio_flush(void)
 {
         bool ordy = ((stdout) && (stdout->op->write));
         
+        if (!ordy)
+                return;
+
         spinlock_lock(&kio_lock);
-        
-        /* Print charaters stored in kernel log */
-        if (ordy) {
-                while (kio_stored > 0) {
-                        wchar_t tmp = kio[(kio_start + kio_len - kio_stored) % KIO_LENGTH];
-                        kio_stored--;
-                        
-                        /*
-                         * We need to give up the spinlock for
-                         * the physical operation of writting out
-                         * the character.
-                         */
-                        spinlock_unlock(&kio_lock);
-                        stdout->op->write(stdout, tmp);
-                        spinlock_lock(&kio_lock);
-                }
-        }
-        
-        /* Store character in the cyclic kernel log */
+
+        /* Print characters that weren't printed earlier */
+        while (kio_stored > 0) {
+                wchar_t tmp = kio[(kio_start + kio_len - kio_stored) % KIO_LENGTH];
+                kio_stored--;
+
+                /*
+                 * We need to give up the spinlock for
+                 * the physical operation of writing out
+                 * the character.
+                 */
+                spinlock_unlock(&kio_lock);
+                stdout->op->write(stdout, tmp);
+                spinlock_lock(&kio_lock);
+        }
+
+        spinlock_unlock(&kio_lock);
+}
+
+/** Put a character into the output buffer.
+ * 
+ * The caller is required to hold kio_lock
+ */
+void kio_push_char(const wchar_t ch)
+{
         kio[(kio_start + kio_len) % KIO_LENGTH] = ch;
         if (kio_len < KIO_LENGTH)
@@ -293 +305 @@
                 kio_start = (kio_start + 1) % KIO_LENGTH;
         
-        if (!ordy) {
-                if (kio_stored < kio_len)
-                        kio_stored++;
-        }
+        if (kio_stored < kio_len)
+                kio_stored++;
         
         /* The character is stored for uspace */
         if (kio_uspace < kio_len)
                 kio_uspace++;
-        
+}
+
+void putchar(const wchar_t ch)
+{
+        bool ordy = ((stdout) && (stdout->op->write));
+        
+        spinlock_lock(&kio_lock);
+        kio_push_char(ch);
         spinlock_unlock(&kio_lock);
         
-        if (ordy) {
-                /*
-                 * Output the character. In this case
-                 * it should be no longer buffered.
-                 */
-                stdout->op->write(stdout, ch);
-        } else {
+        /* Output stored characters */
+        kio_flush();
+        
+        if (!ordy) {
                 /*
                  * No standard output routine defined yet.

kernel/generic/src/main/main.c

@@ -62 +62 @@
 #include <console/kconsole.h>
 #include <console/console.h>
+#include <log.h>
 #include <cpu.h>
 #include <align.h>
@@ -282 +283 @@
         event_init();
         kio_init();
+        log_init();
         stats_init();
         

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). */