Changes in kernel/generic/src/proc/task.c [5d0500c:2f2beb4] in mainline

File:

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

kernel/generic/src/proc/task.c

@@ -90 +90 @@
         TASK = NULL;
         avltree_create(&tasks_tree);
-        task_slab = slab_cache_create("task_slab", sizeof(task_t), 0,
+        task_slab = slab_cache_create("task_t", sizeof(task_t), 0,
             tsk_constructor, NULL, 0);
 }
@@ -125 +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 */
@@ -156 +166 @@
         
         list_initialize(&task->threads);
-        list_initialize(&task->sync_boxes);
         
         ipc_answerbox_init(&task->answerbox, task);
@@ -162 +171 @@
         size_t i;
         for (i = 0; i < IPC_MAX_PHONES; i++)
-                ipc_phone_init(&task->phones[i]);
+                ipc_phone_init(&task->phones[i], task);
+
+        spinlock_initialize(&task->active_calls_lock, "active_calls_lock");
+        list_initialize(&task->active_calls);
         
 #ifdef CONFIG_UDEBUG
@@ -194 +206 @@
         task->ucycles = 0;
         task->kcycles = 0;
-        
+
         task->ipc_info.call_sent = 0;
         task->ipc_info.call_received = 0;
@@ -204 +216 @@
         event_task_init(task);
         
+        task->answerbox.active = true;
+
 #ifdef CONFIG_UDEBUG
         /* Init debugging stuff */
@@ -209 +223 @@
         
         /* Init kbox stuff */
+        task->kb.box.active = true;
         task->kb.finished = false;
 #endif
@@ -214 +229 @@
         if ((ipc_phone_0) &&
             (container_check(ipc_phone_0->task->container, task->container)))
-                ipc_phone_connect(&task->phones[0], ipc_phone_0);
+                (void) ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
         btree_create(&task->futexes);