Changeset 669f3d32 in mainline for kernel/generic/src/proc/task.c

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.

File:

• kernel/generic/src/proc/task.c (modified) (5 diffs)

kernel/generic/src/proc/task.c

@@ -41 +41 @@
 #include <mm/slab.h>
 #include <atomic.h>
+#include <synch/futex.h>
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
@@ -153 +154 @@
         
         irq_spinlock_initialize(&task->lock, "task_t_lock");
-        mutex_initialize(&task->futexes_lock, MUTEX_PASSIVE);
         
         list_initialize(&task->threads);
@@ -165 +165 @@
         spinlock_initialize(&task->active_calls_lock, "active_calls_lock");
         list_initialize(&task->active_calls);
+        
+        mutex_initialize(&task->futex_list_lock, MUTEX_PASSIVE);
+        list_initialize(&task->futex_list);
         
 #ifdef CONFIG_UDEBUG
@@ -221 +224 @@
                 (void) ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
-        btree_create(&task->futexes);
+        futex_task_init(task);
         
         /*
@@ -262 +265 @@
          * Free up dynamically allocated state.
          */
-        btree_destroy(&task->futexes);
+        futex_task_deinit(task);
         
         /*