Changeset fd07e57b in mainline for kernel/generic/src/main

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:

kernel/generic/src/main

Files:

• kinit.c (modified) (6 diffs)
• main.c (modified) (2 diffs)
• shutdown.c (modified) (2 diffs)

kernel/generic/src/main/kinit.c

@@ -59 +59 @@
 #include <mm/km.h>
 #include <print.h>
+#include <log.h>
 #include <memstr.h>
 #include <console/console.h>
@@ -140 +141 @@
                                 thread_ready(thread);
                         } else
-                                printf("Unable to create kcpulb thread for cpu%u\n", i);
+                                log(LF_OTHER, LVL_ERROR,
+                                    "Unable to create kcpulb thread for cpu%u", i);
                 }
         }
@@ -156 +158 @@
                 thread_ready(thread);
         else
-                printf("Unable to create kload thread\n");
+                log(LF_OTHER, LVL_ERROR, "Unable to create kload thread");
         
 #ifdef CONFIG_KCONSOLE
@@ -168 +170 @@
                         thread_ready(thread);
                 else
-                        printf("Unable to create kconsole thread\n");
+                        log(LF_OTHER, LVL_ERROR,
+                            "Unable to create kconsole thread");
         }
 #endif /* CONFIG_KCONSOLE */
@@ -210 +213 @@
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].paddr % FRAME_SIZE) {
-                        printf("init[%zu]: Address is not frame aligned\n", i);
+                        log(LF_OTHER, LVL_ERROR,
+                            "init[%zu]: Address is not frame aligned", i);
                         programs[i].task = NULL;
                         continue;
@@ -273 +277 @@
                         init_rd((void *) init.tasks[i].paddr, init.tasks[i].size);
                 } else
-                        printf("init[%zu]: Init binary load failed "
-                            "(error %d, loader status %u)\n", i, rc,
+                        log(LF_OTHER, LVL_ERROR,
+                            "init[%zu]: Init binary load failed "
+                            "(error %d, loader status %u)", i, rc,
                             programs[i].loader_status);
         }

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>
@@ -281 +282 @@
         ipc_init();
         event_init();
-        klog_init();
+        kio_init();
+        log_init();
         stats_init();
         

kernel/generic/src/main/shutdown.c

@@ -39 +39 @@
 #include <func.h>
 #include <print.h>
+#include <log.h>
 
 void reboot(void)
@@ -45 +46 @@
         
 #ifdef CONFIG_DEBUG
-        printf("Rebooting the system\n");
+        log(LF_OTHER, LVL_DEBUG, "Rebooting the system");
 #endif