Changeset 6eef3c4 in mainline for kernel/generic/src/proc

Timestamp:

2012-06-20T16:18:37Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8b36bf2, f22dc820

Parents:

abfc9f3

Message:

cleanup thread_create() and thread_t structure

• remove 'flag' bitfield from thread_t, use individual boolean flags (can be optimized later on by adding : 1)
• use an enum for call flags, add THREAD_FLAG_NONE
• remove the 'uncounted' argument in favour of a call flag
• introduce thread_wire() to setup wired threads

Location:

kernel/generic/src/proc

Files:

• program.c (modified) (1 diff)
• scheduler.c (modified) (6 diffs)
• thread.c (modified) (13 diffs)

kernel/generic/src/proc/program.c

@@ -102 +102 @@
          */
         prg->main_thread = thread_create(uinit, kernel_uarg, prg->task,
-            THREAD_FLAG_USPACE, "uinit", false);
+            THREAD_FLAG_USPACE, "uinit");
         if (!prg->main_thread) {
                 free(kernel_uarg);

kernel/generic/src/proc/scheduler.c

@@ -98 +98 @@
         else {
                 fpu_init();
-                THREAD->fpu_context_exists = 1;
+                THREAD->fpu_context_exists = true;
         }
 #endif
@@ -142 +142 @@
                 
                 /* Don't prevent migration */
-                CPU->fpu_owner->fpu_context_engaged = 0;
+                CPU->fpu_owner->fpu_context_engaged = false;
                 irq_spinlock_unlock(&CPU->fpu_owner->lock, false);
                 CPU->fpu_owner = NULL;
@@ -163 +163 @@
                 }
                 fpu_init();
-                THREAD->fpu_context_exists = 1;
+                THREAD->fpu_context_exists = true;
         }
         
         CPU->fpu_owner = THREAD;
-        THREAD->fpu_context_engaged = 1;
+        THREAD->fpu_context_engaged = true;
         irq_spinlock_unlock(&THREAD->lock, false);
         
@@ -248 +248 @@
                 
                 /*
-                 * Clear the THREAD_FLAG_STOLEN flag so that t can be migrated
+                 * Clear the stolen flag so that it can be migrated
                  * when load balancing needs emerge.
                  */
-                thread->flags &= ~THREAD_FLAG_STOLEN;
+                thread->stolen = false;
                 irq_spinlock_unlock(&thread->lock, false);
                 
@@ -630 +630 @@
                                 irq_spinlock_lock(&thread->lock, false);
                                 
-                                if (!(thread->flags & THREAD_FLAG_WIRED) &&
-                                    !(thread->flags & THREAD_FLAG_STOLEN) &&
-                                    !thread->nomigrate &&
-                                    !thread->fpu_context_engaged) {
+                                if ((!thread->wired) && (!thread->stolen) &&
+                                    (!thread->nomigrate) &&
+                                    (!thread->fpu_context_engaged)) {
                                         /*
                                          * Remove thread from ready queue.
@@ -670 +669 @@
 #endif
                                 
-                                thread->flags |= THREAD_FLAG_STOLEN;
+                                thread->stolen = true;
                                 thread->state = Entering;
                                 

kernel/generic/src/proc/thread.c

@@ -191 +191 @@
         kmflags |= FRAME_LOWMEM;
         kmflags &= ~FRAME_HIGHMEM;
-
+        
         thread->kstack = (uint8_t *) frame_alloc(STACK_FRAMES, FRAME_KA | kmflags);
         if (!thread->kstack) {
@@ -247 +247 @@
 }
 
+/** Wire thread to the given CPU
+ *
+ * @param cpu CPU to wire the thread to.
+ *
+ */
+void thread_wire(thread_t *thread, cpu_t *cpu)
+{
+        irq_spinlock_lock(&thread->lock, true);
+        thread->cpu = cpu;
+        thread->wired = true;
+        irq_spinlock_unlock(&thread->lock, true);
+}
+
 /** Make thread ready
  *
@@ -260 +273 @@
         ASSERT(thread->state != Ready);
         
-        int i = (thread->priority < RQ_COUNT - 1)
-            ? ++thread->priority : thread->priority;
-        
-        cpu_t *cpu = CPU;
-        if (thread->flags & THREAD_FLAG_WIRED) {
+        int i = (thread->priority < RQ_COUNT - 1) ?
+            ++thread->priority : thread->priority;
+        
+        cpu_t *cpu;
+        if (thread->wired) {
                 ASSERT(thread->cpu != NULL);
                 cpu = thread->cpu;
-        }
+        } else
+                cpu = CPU;
+        
         thread->state = Ready;
         
@@ -298 +313 @@
  * @param flags     Thread flags.
  * @param name      Symbolic name (a copy is made).
- * @param uncounted Thread's accounting doesn't affect accumulated task
- *                  accounting.
  *
  * @return New thread's structure on success, NULL on failure.
@@ -305 +318 @@
  */
 thread_t *thread_create(void (* func)(void *), void *arg, task_t *task,
-    unsigned int flags, const char *name, bool uncounted)
+    thread_flags_t flags, const char *name)
 {
         thread_t *thread = (thread_t *) slab_alloc(thread_slab, 0);
@@ -335 +348 @@
         thread->ucycles = 0;
         thread->kcycles = 0;
-        thread->uncounted = uncounted;
+        thread->uncounted =
+            ((flags & THREAD_FLAG_UNCOUNTED) == THREAD_FLAG_UNCOUNTED);
         thread->priority = -1;          /* Start in rq[0] */
         thread->cpu = NULL;
-        thread->flags = flags;
+        thread->wired = false;
+        thread->stolen = false;
+        thread->uspace =
+            ((flags & THREAD_FLAG_USPACE) == THREAD_FLAG_USPACE);
+        
         thread->nomigrate = 0;
         thread->state = Entering;
@@ -356 +374 @@
         thread->task = task;
         
-        thread->fpu_context_exists = 0;
-        thread->fpu_context_engaged = 0;
+        thread->fpu_context_exists = false;
+        thread->fpu_context_engaged = false;
         
         avltree_node_initialize(&thread->threads_tree_node);
@@ -371 +389 @@
         thread_create_arch(thread);
         
-        if (!(flags & THREAD_FLAG_NOATTACH))
+        if ((flags & THREAD_FLAG_NOATTACH) != THREAD_FLAG_NOATTACH)
                 thread_attach(thread, task);
         
@@ -437 +455 @@
         
         /* Must not count kbox thread into lifecount */
-        if (thread->flags & THREAD_FLAG_USPACE)
+        if (thread->uspace)
                 atomic_inc(&task->lifecount);
         
@@ -459 +477 @@
 void thread_exit(void)
 {
-        if (THREAD->flags & THREAD_FLAG_USPACE) {
+        if (THREAD->uspace) {
 #ifdef CONFIG_UDEBUG
                 /* Generate udebug THREAD_E event */
                 udebug_thread_e_event();
-
+                
                 /*
                  * This thread will not execute any code or system calls from
@@ -506 +524 @@
 {
         ASSERT(THREAD);
-
+        
         THREAD->nomigrate++;
 }
@@ -515 +533 @@
         ASSERT(THREAD);
         ASSERT(THREAD->nomigrate > 0);
-
-        THREAD->nomigrate--;
+        
+        if (THREAD->nomigrate > 0)
+                THREAD->nomigrate--;
 }
 
@@ -865 +884 @@
         
         thread_t *thread = thread_create(uinit, kernel_uarg, TASK,
-            THREAD_FLAG_USPACE | THREAD_FLAG_NOATTACH, namebuf, false);
+            THREAD_FLAG_USPACE | THREAD_FLAG_NOATTACH, namebuf);
         if (thread) {
                 if (uspace_thread_id != NULL) {