Changeset fd07e57b in mainline for kernel/arch/ia32/src/smp/smp.c

Timestamp:

2014-01-05T21:25:41Z (11 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)

File:

• kernel/arch/ia32/src/smp/smp.c (modified) (3 diffs)

kernel/arch/ia32/src/smp/smp.c

@@ -52 +52 @@
 #include <mm/slab.h>
 #include <mm/as.h>
-#include <print.h>
+#include <log.h>
 #include <memstr.h>
 #include <arch/drivers/i8259.h>
@@ -129 +129 @@
                 
                 if (ops->cpu_apic_id(i) == bsp_l_apic) {
-                        printf("kmp: bad processor entry #%u, will not send IPI "
-                            "to myself\n", i);
+                        log(LF_ARCH, LVL_ERROR, "kmp: bad processor entry #%u, "
+                            "will not send IPI to myself", i);
                         continue;
                 }
@@ -162 +162 @@
                         if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
                             SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) {
-                                printf("%s: waiting for cpu%u (APIC ID = %d) "
-                                    "timed out\n", __FUNCTION__, i,
-                                    ops->cpu_apic_id(i));
+                                log(LF_ARCH, LVL_NOTE, "%s: waiting for cpu%u "
+                                    "(APIC ID = %d) timed out", __FUNCTION__,
+                                    i, ops->cpu_apic_id(i));
                         }
                 } else
-                        printf("INIT IPI for l_apic%d failed\n",
+                        log(LF_ARCH, LVL_ERROR, "INIT IPI for l_apic%d failed",
                             ops->cpu_apic_id(i));
         }