Changes in kernel/generic/src/proc/scheduler.c [e1326cf:1558d85] in mainline

File:

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

kernel/generic/src/proc/scheduler.c

@@ -52 +52 @@
 #include <atomic.h>
 #include <synch/spinlock.h>
+#include <synch/workqueue.h>
+#include <synch/rcu.h>
 #include <config.h>
 #include <context.h>
@@ -61 +63 @@
 #include <cpu.h>
 #include <print.h>
+#include <log.h>
 #include <debug.h>
 #include <stacktrace.h>
@@ -86 +89 @@
 {
         before_thread_runs_arch();
+        rcu_before_thread_runs();
         
 #ifdef CONFIG_FPU_LAZY
@@ -126 +130 @@
 static void after_thread_ran(void)
 {
+        workq_after_thread_ran();
+        rcu_after_thread_ran();
         after_thread_ran_arch();
 }
@@ -218 +224 @@
                 goto loop;
         }
+
+        ASSERT(!CPU->idle);
         
         unsigned int i;
@@ -397 +405 @@
         ASSERT((!THREAD) || (irq_spinlock_locked(&THREAD->lock)));
         ASSERT(CPU != NULL);
+        ASSERT(interrupts_disabled());
         
         /*
@@ -420 +429 @@
                 
                 case Exiting:
+                        rcu_thread_exiting();
 repeat:
                         if (THREAD->detached) {
@@ -517 +527 @@
         
 #ifdef SCHEDULER_VERBOSE
-        printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64 
-            ", nrdy=%ld)\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 +674 @@
                                 
 #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);
@@ -739 +751 @@
                         
                         printf("\trq[%u]: ", i);
-                        list_foreach(cpus[cpu].rq[i].rq, cur) {
-                                thread_t *thread = list_get_instance(cur,
-                                    thread_t, rq_link);
+                        list_foreach(cpus[cpu].rq[i].rq, rq_link, thread_t,
+                            thread) {
                                 printf("%" PRIu64 "(%s) ", thread->tid,
                                     thread_states[thread->state]);