Changeset b2fa1204 in mainline for kernel/generic/src/proc

Timestamp:

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

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

ca05e9b

Parents:

bd6ff94

Message:

Cherrypick usage of kernel logger

Location:

kernel/generic/src/proc

Files:

• program.c (modified) (4 diffs)
• scheduler.c (modified) (3 diffs)

kernel/generic/src/proc/program.c

@@ -49 +49 @@
 #include <lib/elf_load.h>
 #include <errno.h>
-#include <print.h>
+#include <log.h>
 #include <syscall/copy.h>
 #include <proc/program.h>
@@ -155 +155 @@
                 
                 program_loader = image_addr;
-                printf("Program loader at %p\n", (void *) image_addr);
+                log(LF_OTHER, LVL_NOTE, "Program loader at %p", (void *) image_addr);
                 
                 return EOK;
@@ -181 +181 @@
         if (!loader) {
                 as_destroy(as);
-                printf("Cannot spawn loader as none was registered\n");
+                log(LF_OTHER, LVL_ERROR,
+                    "Cannot spawn loader as none was registered");
                 return ENOENT;
         }
@@ -189 +190 @@
         if (prg->loader_status != EE_OK) {
                 as_destroy(as);
-                printf("Cannot spawn loader (%s)\n",
+                log(LF_OTHER, LVL_ERROR, "Cannot spawn loader (%s)",
                     elf_error(prg->loader_status));
                 return ENOENT;

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);