Changeset 235d31d in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2014-12-22T17:47:40Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8c7d5ad

Parents:

eae91e0 (diff), 759ea0d (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 the CHT pre-integration branch

This branch contains:

• the merge of lp:~adam-hraska+lp/helenos/rcu, which brings:

• a new preemptible kernel RCU variant called A-RCU,
• a preemptible variant of Podzimek's non-preemptible kernel RCU and
• a new variant of usersace RCU,
• a new concurrent hash table (CHT) implementation based on RCU,
• a deployment of CHT in kernel futex handling,
• a deployment of the userspace RCU in the implementation of upgradable futexes,

all described in Adam Hraska's master thesis named Read-Copy-Update
for HelenOS, defended in 2013 at MFF UK; furthemore, the branch
fixes two synchronization bugs in condvars and waitq, respectively:

• revid:adam.hraska+hos@gmail.com-20121116144921-3to9u1tn1sg07rg7
• revid:adam.hraska+hos@gmail.com-20121116173623-km7gwtqixwudpe66

• build fixes required to pass make check
• overhaul of ia64 and sparc64 trap handling, to allow exc_dispatch() to be used now when the kernel is more picky about CPU state accounting
• an important fix of the sparc64/sun4v preemptible trap handler
• various other fixes of issues discovered on non-x86 architectures

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