Changes in kernel/generic/src/proc/task.c [41df2827:40240b1] in mainline

File:

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

kernel/generic/src/proc/task.c

@@ -54 +54 @@
 #include <func.h>
 #include <string.h>
-#include <memstr.h>
 #include <syscall/copy.h>
 #include <macros.h>
@@ -76 +75 @@
 static task_id_t task_counter = 0;
 
-static slab_cache_t *task_slab;
-
 /* Forward declarations. */
 static void task_kill_internal(task_t *);
-static int tsk_constructor(void *, int);
 
 /** Initialize kernel tasks support. */
@@ -87 +83 @@
         TASK = NULL;
         avltree_create(&tasks_tree);
-        task_slab = slab_cache_create("task_slab", sizeof(task_t), 0,
-            tsk_constructor, NULL, 0);
 }
 
@@ -134 +128 @@
 }
 
-int tsk_constructor(void *obj, int kmflags)
-{
-        task_t *ta = obj;
+/** Create new task with no threads.
+ *
+ * @param as            Task's address space.
+ * @param name          Symbolic name (a copy is made).
+ *
+ * @return              New task's structure.
+ *
+ */
+task_t *task_create(as_t *as, char *name)
+{
+        ipl_t ipl;
+        task_t *ta;
         int i;
+        
+        ta = (task_t *) malloc(sizeof(task_t), 0);
+
+        task_create_arch(ta);
+
+        spinlock_initialize(&ta->lock, "task_ta_lock");
+        list_initialize(&ta->th_head);
+        ta->as = as;
+
+        memcpy(ta->name, name, TASK_NAME_BUFLEN);
+        ta->name[TASK_NAME_BUFLEN - 1] = 0;
 
         atomic_set(&ta->refcount, 0);
         atomic_set(&ta->lifecount, 0);
-        atomic_set(&ta->active_calls, 0);
-
-        spinlock_initialize(&ta->lock, "task_ta_lock");
-        mutex_initialize(&ta->futexes_lock, MUTEX_PASSIVE);
-
-        list_initialize(&ta->th_head);
-        list_initialize(&ta->sync_box_head);
+        ta->context = CONTEXT;
+
+        ta->capabilities = 0;
+        ta->cycles = 0;
+
+#ifdef CONFIG_UDEBUG
+        /* Init debugging stuff */
+        udebug_task_init(&ta->udebug);
+
+        /* Init kbox stuff */
+        ipc_answerbox_init(&ta->kb.box, ta);
+        ta->kb.thread = NULL;
+        mutex_initialize(&ta->kb.cleanup_lock, MUTEX_PASSIVE);
+        ta->kb.finished = false;
+#endif
 
         ipc_answerbox_init(&ta->answerbox, ta);
         for (i = 0; i < IPC_MAX_PHONES; i++)
                 ipc_phone_init(&ta->phones[i]);
-
-#ifdef CONFIG_UDEBUG
-        /* Init kbox stuff */
-        ta->kb.thread = NULL;
-        ipc_answerbox_init(&ta->kb.box, ta);
-        mutex_initialize(&ta->kb.cleanup_lock, MUTEX_PASSIVE);
-#endif
-
-        return 0;
-}
-
-/** Create new task with no threads.
- *
- * @param as            Task's address space.
- * @param name          Symbolic name (a copy is made).
- *
- * @return              New task's structure.
- *
- */
-task_t *task_create(as_t *as, char *name)
-{
-        ipl_t ipl;
-        task_t *ta;
-        
-        ta = (task_t *) slab_alloc(task_slab, 0);
-        task_create_arch(ta);
-        ta->as = as;
-        memcpy(ta->name, name, TASK_NAME_BUFLEN);
-        ta->name[TASK_NAME_BUFLEN - 1] = 0;
-
-        ta->context = CONTEXT;
-        ta->capabilities = 0;
-        ta->cycles = 0;
-
-#ifdef CONFIG_UDEBUG
-        /* Init debugging stuff */
-        udebug_task_init(&ta->udebug);
-
-        /* Init kbox stuff */
-        ta->kb.finished = false;
-#endif
-
-        if ((ipc_phone_0) &&
-            (context_check(ipc_phone_0->task->context, ta->context)))
+        if ((ipc_phone_0) && (context_check(ipc_phone_0->task->context,
+            ta->context)))
                 ipc_phone_connect(&ta->phones[0], ipc_phone_0);
-
+        atomic_set(&ta->active_calls, 0);
+
+        mutex_initialize(&ta->futexes_lock, MUTEX_PASSIVE);
         btree_create(&ta->futexes);
         
         ipl = interrupts_disable();
+
+        /*
+         * Increment address space reference count.
+         */
         atomic_inc(&as->refcount);
+
         spinlock_lock(&tasks_lock);
         ta->taskid = ++task_counter;
@@ -242 +229 @@
                 as_destroy(t->as);
         
-        slab_free(task_slab, t);
+        free(t);
         TASK = NULL;
 }