Changeset 1a5fe4f in mainline for kernel/generic/include

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/include

Files:

• adt/cht.h (deleted)
• arch.h (modified) (1 diff)
• cpu.h (modified) (2 diffs)
• proc/task.h (modified) (2 diffs)
• proc/thread.h (modified) (2 diffs)
• smp/smp_call.h (deleted)
• synch/futex.h (modified) (1 diff)
• synch/rcu.h (deleted)
• synch/rcu_types.h (deleted)
• synch/smp_memory_barrier.h (deleted)
• synch/workqueue.h (deleted)

kernel/generic/include/arch.h

@@ -66 +66 @@
 typedef struct {
         size_t preemption;     /**< Preemption disabled counter and flag. */
-#ifdef RCU_PREEMPT_A
-        size_t rcu_nesting;    /**< RCU nesting count and flag. */
-#endif
         struct thread *thread; /**< Current thread. */
         struct task *task;     /**< Current task. */

kernel/generic/include/cpu.h

@@ -38 +38 @@
 #include <mm/tlb.h>
 #include <synch/spinlock.h>
-#include <synch/rcu_types.h>
 #include <proc/scheduler.h>
 #include <arch/cpu.h>
@@ -99 +98 @@
 
         /**
-         * SMP calls to invoke on this CPU.
-         */
-        SPINLOCK_DECLARE(smp_calls_lock);
-        list_t smp_pending_calls;
-
-        /** RCU per-cpu data. Uses own locking. */
-        rcu_cpu_data_t rcu;
-
-        /**
          * Stack used by scheduler when there is no running thread.
          */

kernel/generic/include/proc/task.h

@@ -43 +43 @@
 #include <synch/mutex.h>
 #include <synch/futex.h>
-#include <synch/workqueue.h>
-#include <adt/cht.h>
 #include <adt/list.h>
 #include <adt/odict.h>
@@ -130 +128 @@
         task_arch_t arch;
 
-        struct futex_cache {
-                /** CHT mapping virtual addresses of futex variables to futex objects.*/
-                cht_t ht;
-                /** Serializes access to futex_list.*/
-                SPINLOCK_DECLARE(list_lock);
-                /** List of all futexes accesses by this task. */
-                list_t list;
-                work_t destroy_work;
-        } *futexes;
+        /** Serializes access to futex_list.*/
+        SPINLOCK_DECLARE(futex_list_lock);
+        /** List of all futexes accesses by this task. */
+        list_t futex_list;
 
         /** Accumulated accounting. */

kernel/generic/include/proc/thread.h

@@ -41 +41 @@
 #include <cpu.h>
 #include <synch/spinlock.h>
-#include <synch/rcu_types.h>
 #include <adt/odict.h>
 #include <mm/slab.h>
@@ -194 +193 @@
         thread_id_t tid;
 
-        /** Work queue this thread belongs to or NULL. Immutable. */
-        struct work_queue *workq;
-        /** Links work queue threads. Protected by workq->lock. */
-        link_t workq_link;
-        /** True if the worker was blocked and is not running. Use thread->lock. */
-        bool workq_blocked;
-        /** True if the worker will block in order to become idle. Use workq->lock. */
-        bool workq_idling;
-
-        /** RCU thread related data. Protected by its own locks. */
-        rcu_thread_data_t rcu;
-
         /** Architecture-specific data. */
         thread_arch_t arch;

kernel/generic/include/synch/futex.h

@@ -58 +58 @@
 extern void futex_task_cleanup(void);
 extern void futex_task_init(struct task *);
-extern void futex_task_deinit(struct task *);
 
 #endif