Changes in kernel/generic/src/proc/task.c [3ac5086:908bb96] in mainline

File:

• kernel/generic/src/proc/task.c (modified) (6 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>
@@ -154 +153 @@
         
         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);
-                
+        
 #ifdef CONFIG_UDEBUG
         /* Init kbox stuff */
@@ -196 +196 @@
         task->ucycles = 0;
         task->kcycles = 0;
-        
+
         task->ipc_info.call_sent = 0;
         task->ipc_info.call_received = 0;
@@ -221 +221 @@
                 (void) ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
-        futex_task_init(task);
+        btree_create(&task->futexes);
         
         /*
@@ -262 +262 @@
          * Free up dynamically allocated state.
          */
-        futex_task_deinit(task);
+        btree_destroy(&task->futexes);
         
         /*