Changeset 1a5fe4f in mainline for kernel/generic/src/proc

Timestamp:

2018-11-09T18:09:55Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

1892d2c

Parents:

3875f106 (diff), ef4218f (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.

git-author:

Jakub Jermář <jakub@…> (2018-11-09 18:09:55)

git-committer:

GitHub <noreply@…> (2018-11-09 18:09:55)

Message:

Merge pull request #54 from jermar/rcuremoval

Remove RCU and related features

Location:

kernel/generic/src/proc

Files:

• scheduler.c (modified) (4 diffs)
• task.c (modified) (1 diff)
• the.c (modified) (1 diff)
• thread.c (modified) (5 diffs)

kernel/generic/src/proc/scheduler.c

@@ -54 +54 @@
 #include <atomic.h>
 #include <synch/spinlock.h>
-#include <synch/workqueue.h>
-#include <synch/rcu.h>
 #include <config.h>
 #include <context.h>
@@ -90 +88 @@
 {
         before_thread_runs_arch();
-        rcu_before_thread_runs();
 
 #ifdef CONFIG_FPU_LAZY
@@ -131 +128 @@
 static void after_thread_ran(void)
 {
-        workq_after_thread_ran();
-        rcu_after_thread_ran();
         after_thread_ran_arch();
 }
@@ -430 +425 @@
 
                 case Exiting:
-                        rcu_thread_exiting();
                 repeat:
                         if (THREAD->detached) {

kernel/generic/src/proc/task.c

@@ -285 +285 @@
 
         /*
-         * Free up dynamically allocated state.
-         */
-        futex_task_deinit(task);
-
-        /*
          * Drop our reference to the address space.
          */

kernel/generic/src/proc/the.c

@@ -60 +60 @@
         the->as = NULL;
         the->magic = MAGIC;
-#ifdef RCU_PREEMPT_A
-        the->rcu_nesting = 0;
-#endif
 }
 

kernel/generic/src/proc/thread.c

@@ -48 +48 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
-#include <synch/workqueue.h>
-#include <synch/rcu.h>
 #include <cpu.h>
 #include <str.h>
@@ -69 +67 @@
 #include <syscall/copy.h>
 #include <errno.h>
+#include <debug.h>
 
 /** Thread states */
@@ -272 +271 @@
 {
         assert(irq_spinlock_locked(&thread->lock));
-        workq_before_thread_is_ready(thread);
 }
 
@@ -399 +397 @@
         thread->task = task;
 
-        thread->workq = NULL;
-
         thread->fpu_context_exists = false;
         thread->fpu_context_engaged = false;
@@ -414 +410 @@
         /* Might depend on previous initialization */
         thread_create_arch(thread);
-
-        rcu_thread_init(thread);
 
         if ((flags & THREAD_FLAG_NOATTACH) != THREAD_FLAG_NOATTACH)