Changeset 669f3d32 in mainline for kernel/generic/include

Timestamp:

2012-11-20T18:26:14Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

c28413a9

Parents:

04d66804

Message:

Adapted the kernel futex subsystem to use CHT.

Location:

kernel/generic/include

Files:

• proc/task.h (modified) (2 diffs)
• synch/futex.h (modified) (1 diff)

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>
@@ -127 +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;
+        /** Serializes access to futex_list (independent of the task spinlock). */
+        mutex_t futex_list_lock;
+        /** List of all futexes accesses by this task. */
+        list_t futex_list;
+        /** CHT mapping virtual addresses of futex variables to futex objects. */
+        struct futex_cache {
+                work_t destroy_work;
+                cht_t ht;
+        } *futexes;
         
         /** Accumulated accounting. */

kernel/generic/include/synch/futex.h

@@ -55 +55 @@
 extern sysarg_t sys_futex_wakeup(uintptr_t);
 
-extern void futex_cleanup(void);
+extern void futex_task_cleanup(void);
+extern void futex_task_init(struct task *);
+extern void futex_task_deinit(struct task *);
 
 #endif