Changes in kernel/generic/include/proc/task.h [faec9fc:908bb96] in mainline

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>
@@ -59 +57 @@
 #include <mm/as.h>
 #include <abi/sysinfo.h>
-#include <arch.h>
-
-#define TASK                 THE->task
-
 
 struct thread;
@@ -129 +123 @@
         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 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;
         
         /** Accumulated accounting. */