Changeset 58775d30 in mainline for kernel/generic/include/proc/task.h

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2003739

Parents:

6069061 (diff), 795e2bf (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:

Mainline changes

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. */