Changeset 58775d30 in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2003739

Parents:

6069061 (diff), 795e2bf (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:

Mainline changes

File:

• kernel/generic/src/proc/scheduler.c (modified) (7 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>
@@ -64 +66 @@
 #include <debug.h>
 #include <stacktrace.h>
+#include <cpu.h>
 
 static void scheduler_separated_stack(void);
@@ -87 +90 @@
 {
         before_thread_runs_arch();
+        rcu_before_thread_runs();
         
 #ifdef CONFIG_FPU_LAZY
@@ -127 +131 @@
 static void after_thread_ran(void)
 {
+        workq_after_thread_ran();
+        rcu_after_thread_ran();
         after_thread_ran_arch();
 }
@@ -219 +225 @@
                 goto loop;
         }
+
+        ASSERT(!CPU->idle);
         
         unsigned int i;
@@ -398 +406 @@
         ASSERT((!THREAD) || (irq_spinlock_locked(&THREAD->lock)));
         ASSERT(CPU != NULL);
+        ASSERT(interrupts_disabled());
         
         /*
@@ -421 +430 @@
                 
                 case Exiting:
+                        rcu_thread_exiting();
 repeat:
                         if (THREAD->detached) {