Changeset 235d31d in mainline for kernel/generic/include/proc/task.h

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/include/proc/task.h (modified) (3 diffs)

kernel/generic/include/proc/task.h

@@ -43 +43 @@
 #include <synch/mutex.h>
 #include <synch/futex.h>
+#include <synch/workqueue.h>
 #include <adt/avl.h>
 #include <adt/btree.h>
+#include <adt/cht.h>
 #include <adt/list.h>
 #include <security/cap.h>
@@ -57 +59 @@
 #include <mm/as.h>
 #include <abi/sysinfo.h>
+#include <arch.h>
+
+#define TASK                 THE->task
+
 
 struct thread;
@@ -123 +129 @@
         task_arch_t arch;
         
-        /**
-         * Serializes access to the B+tree of task's futexes. This mutex is
-         * independent on the task spinlock.
-         */
-        mutex_t futexes_lock;
-        /** B+tree of futexes referenced by this task. */
-        btree_t futexes;
+        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;
         
         /** Accumulated accounting. */