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

File:

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

kernel/generic/src/proc/task.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
 #include <proc/thread.h>
 #include <proc/task.h>
@@ -41 +42 @@
 #include <mm/slab.h>
 #include <atomic.h>
+#include <synch/futex.h>
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
@@ -48 +50 @@
 #include <adt/btree.h>
 #include <adt/list.h>
+#include <cap/cap.h>
 #include <ipc/ipc.h>
 #include <ipc/ipcrsc.h>
@@ -55 +58 @@
 #include <func.h>
 #include <str.h>
-#include <memstr.h>
 #include <syscall/copy.h>
 #include <macros.h>
@@ -82 +84 @@
 static void task_kill_internal(task_t *);
 static int tsk_constructor(void *, unsigned int);
+static size_t tsk_destructor(void *obj);
 
 /** Initialize kernel tasks support.
@@ -91 +94 @@
         avltree_create(&tasks_tree);
         task_slab = slab_cache_create("task_t", sizeof(task_t), 0,
-            tsk_constructor, NULL, 0);
+            tsk_constructor, tsk_destructor, 0);
 }
 
@@ -158 +161 @@
 {
         task_t *task = (task_t *) obj;
+
+        int rc = caps_task_alloc(task);
+        if (rc != EOK)
+                return rc;
         
         atomic_set(&task->refcount, 0);
@@ -163 +170 @@
         
         irq_spinlock_initialize(&task->lock, "task_t_lock");
-        mutex_initialize(&task->futexes_lock, MUTEX_PASSIVE);
         
         list_initialize(&task->threads);
@@ -169 +175 @@
         ipc_answerbox_init(&task->answerbox, task);
         
-        size_t i;
-        for (i = 0; i < IPC_MAX_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
         /* Init kbox stuff */
@@ -186 +188 @@
 }
 
+size_t tsk_destructor(void *obj)
+{
+        task_t *task = (task_t *) obj;
+        
+        caps_task_free(task);
+        return 0;
+}
+
 /** Create new task with no threads.
  *
@@ -203 +213 @@
         
         task->container = CONTAINER;
-        task->capabilities = 0;
+        task->perms = 0;
         task->ucycles = 0;
         task->kcycles = 0;
+
+        caps_task_init(task);
 
         task->ipc_info.call_sent = 0;
@@ -228 +240 @@
         
         if ((ipc_phone_0) &&
-            (container_check(ipc_phone_0->task->container, task->container)))
-                (void) ipc_phone_connect(&task->phones[0], ipc_phone_0);
-        
-        btree_create(&task->futexes);
+            (container_check(ipc_phone_0->task->container, task->container))) {
+                cap_handle_t phone_handle = phone_alloc(task);
+                kobject_t *phone_obj = kobject_get(task, phone_handle,
+                    KOBJECT_TYPE_PHONE);
+                (void) ipc_phone_connect(phone_obj->phone, ipc_phone_0);
+        }
+        
+        futex_task_init(task);
         
         /*
@@ -272 +288 @@
          * Free up dynamically allocated state.
          */
-        btree_destroy(&task->futexes);
+        futex_task_deinit(task);
         
         /*
@@ -420 +436 @@
 task_t *task_find_by_id(task_id_t id)
 {
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&tasks_lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&tasks_lock));
 
         avltree_node_t *node =
@@ -444 +460 @@
 void task_get_accounting(task_t *task, uint64_t *ucycles, uint64_t *kcycles)
 {
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&task->lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&task->lock));
 
         /* Accumulated values of task */
@@ -603 +619 @@
         if (*additional)
                 printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
-                    "%9" PRIua, task->taskid, ucycles, usuffix, kcycles,
+                    "%9" PRIua "\n", task->taskid, ucycles, usuffix, kcycles,
                     ksuffix, atomic_get(&task->refcount));
         else
@@ -609 +625 @@
                     task->taskid, task->name, task->container, task, task->as);
 #endif
-        
-        if (*additional) {
-                size_t i;
-                for (i = 0; i < IPC_MAX_PHONES; i++) {
-                        if (task->phones[i].callee)
-                                printf(" %zu:%p", i, task->phones[i].callee);
-                }
-                printf("\n");
-        }
         
         irq_spinlock_unlock(&task->lock, false);