Changeset fd07e57b in mainline for kernel/generic/src/proc/scheduler.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/generic/src/proc/scheduler.c (modified) (3 diffs)

kernel/generic/src/proc/scheduler.c

@@ -61 +61 @@
 #include <cpu.h>
 #include <print.h>
+#include <log.h>
 #include <debug.h>
 #include <stacktrace.h>
@@ -517 +518 @@
         
 #ifdef SCHEDULER_VERBOSE
-        printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
-            ", nrdy=%" PRIua ")\n", CPU->id, THREAD->tid, THREAD->priority,
+        log(LF_OTHER, LVL_DEBUG,
+            "cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
+            ", nrdy=%" PRIua ")", CPU->id, THREAD->tid, THREAD->priority,
             THREAD->ticks, atomic_get(&CPU->nrdy));
 #endif
@@ -663 +665 @@
                                 
 #ifdef KCPULB_VERBOSE
-                                printf("kcpulb%u: TID %" PRIu64 " -> cpu%u, "
-                                    "nrdy=%ld, avg=%ld\n", CPU->id, t->tid,
+                                log(LF_OTHER, LVL_DEBUG,
+                                    "kcpulb%u: TID %" PRIu64 " -> cpu%u, "
+                                    "nrdy=%ld, avg=%ld", CPU->id, t->tid,
                                     CPU->id, atomic_get(&CPU->nrdy),
                                     atomic_get(&nrdy) / config.cpu_active);