Changeset 67392fa in mainline

Timestamp:

2009-11-28T15:20:58Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2e07d27e, db4d6de

Parents:

fb7c52f (diff), 59ee56f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Tasks should be allocated from a dedicated slab allocator cache.
(Merge fix for #139).

Location:

kernel/generic/src

Files:

• ipc/ipc.c (modified) (1 diff)
• proc/task.c (modified) (6 diffs)

kernel/generic/src/ipc/ipc.c

@@ -583 +583 @@
                 for (i = 0; i < IPC_MAX_PHONES; i++) {
                         if (TASK->phones[i].state == IPC_PHONE_HUNGUP &&
-                            atomic_get(&TASK->phones[i].active_calls) == 0)
+                            atomic_get(&TASK->phones[i].active_calls) == 0) {
                                 TASK->phones[i].state = IPC_PHONE_FREE;
+                                TASK->phones[i].callee = NULL;
+                        }
                         
                         /* Just for sure, we might have had some 

kernel/generic/src/proc/task.c

@@ -75 +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. */
@@ -83 +86 @@
         TASK = NULL;
         avltree_create(&tasks_tree);
+        task_slab = slab_cache_create("task_slab", sizeof(task_t), 0,
+            tsk_constructor, NULL, 0);
 }
 
@@ -128 +133 @@
 }
 
+int tsk_constructor(void *obj, int kmflags)
+{
+        task_t *ta = obj;
+        int i;
+
+        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);
+
+        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.
  *
@@ -140 +174 @@
         ipl_t ipl;
         task_t *ta;
-        int i;
-        
-        ta = (task_t *) malloc(sizeof(task_t), 0);
-
+        
+        ta = (task_t *) slab_alloc(task_slab, 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);
         ta->context = CONTEXT;
-
         ta->capabilities = 0;
         ta->cycles = 0;
@@ -165 +190 @@
 
         /* 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]);
-        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);
-        list_initialize(&ta->sync_box_head);
-
-        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;
@@ -230 +241 @@
                 as_destroy(t->as);
         
-        free(t);
+        slab_free(task_slab, t);
         TASK = NULL;
 }