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

File:

• kernel/generic/src/proc/task.c (modified) (9 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>
@@ -126 +125 @@
 {
         size_t tasks_left;
+
+        if (ipc_phone_0) {
+                task_t *task_0 = ipc_phone_0->task;
+                ipc_phone_0 = NULL;
+                /*
+                 * The first task is held by kinit(), we need to release it or
+                 * it will never finish cleanup.
+                 */
+                task_release(task_0);
+        }
         
         /* Repeat until there are any tasks except TASK */
@@ -154 +163 @@
         
         irq_spinlock_initialize(&task->lock, "task_t_lock");
+        mutex_initialize(&task->futexes_lock, MUTEX_PASSIVE);
         
         list_initialize(&task->threads);
@@ -165 +175 @@
         spinlock_initialize(&task->active_calls_lock, "active_calls_lock");
         list_initialize(&task->active_calls);
-                
+        
 #ifdef CONFIG_UDEBUG
         /* Init kbox stuff */
@@ -196 +206 @@
         task->ucycles = 0;
         task->kcycles = 0;
-        
+
         task->ipc_info.call_sent = 0;
         task->ipc_info.call_received = 0;
@@ -221 +231 @@
                 (void) ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
-        futex_task_init(task);
+        btree_create(&task->futexes);
         
         /*
@@ -262 +272 @@
          * Free up dynamically allocated state.
          */
-        futex_task_deinit(task);
+        btree_destroy(&task->futexes);
         
         /*
@@ -442 +452 @@
         
         /* Current values of threads */
-        list_foreach(task->threads, cur) {
-                thread_t *thread = list_get_instance(cur, thread_t, th_link);
-                
+        list_foreach(task->threads, th_link, thread_t, thread) {
                 irq_spinlock_lock(&thread->lock, false);
                 
@@ -474 +482 @@
          */
         
-        list_foreach(task->threads, cur) {
-                thread_t *thread = list_get_instance(cur, thread_t, th_link);
+        list_foreach(task->threads, th_link, thread_t, thread) {
                 bool sleeping = false;