Changes in kernel/generic/src/proc/scheduler.c [b2fa1204:6eef3c4] in mainline

File:

• kernel/generic/src/proc/scheduler.c (modified) (6 diffs)

kernel/generic/src/proc/scheduler.c

@@ -61 +61 @@
 #include <cpu.h>
 #include <print.h>
-#include <log.h>
 #include <debug.h>
 #include <stacktrace.h>
@@ -93 +92 @@
         else
                 fpu_disable();
-#elif defined CONFIG_FPU
+#else
         fpu_enable();
         if (THREAD->fpu_context_exists)
@@ -328 +327 @@
                 THREAD->kcycles += get_cycle() - THREAD->last_cycle;
                 
-#if (defined CONFIG_FPU) && (!defined CONFIG_FPU_LAZY)
+#ifndef CONFIG_FPU_LAZY
                 fpu_context_save(THREAD->saved_fpu_context);
 #endif
@@ -518 +517 @@
         
 #ifdef SCHEDULER_VERBOSE
-        log(LF_OTHER, LVL_DEBUG,
-            "cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
-            ", nrdy=%" PRIua ")", CPU->id, THREAD->tid, THREAD->priority,
+        printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64 
+            ", nrdy=%ld)\n", CPU->id, THREAD->tid, THREAD->priority,
             THREAD->ticks, atomic_get(&CPU->nrdy));
 #endif
@@ -665 +663 @@
                                 
 #ifdef KCPULB_VERBOSE
-                                log(LF_OTHER, LVL_DEBUG,
-                                    "kcpulb%u: TID %" PRIu64 " -> cpu%u, "
-                                    "nrdy=%ld, avg=%ld", CPU->id, t->tid,
+                                printf("kcpulb%u: TID %" PRIu64 " -> cpu%u, "
+                                    "nrdy=%ld, avg=%ld\n", CPU->id, t->tid,
                                     CPU->id, atomic_get(&CPU->nrdy),
                                     atomic_get(&nrdy) / config.cpu_active);
@@ -742 +739 @@
                         
                         printf("\trq[%u]: ", i);
-                        list_foreach(cpus[cpu].rq[i].rq, rq_link, thread_t,
-                            thread) {
+                        list_foreach(cpus[cpu].rq[i].rq, cur) {
+                                thread_t *thread = list_get_instance(cur,
+                                    thread_t, rq_link);
                                 printf("%" PRIu64 "(%s) ", thread->tid,
                                     thread_states[thread->state]);