Changeset 8b36bf2 in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2012-06-20T23:03:29Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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:

Merge mainline changes

File:

• kernel/generic/src/proc/thread.c (modified) (15 diffs)

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) {
@@ -236 +236 @@
         
         atomic_set(&nrdy, 0);
-        thread_slab = slab_cache_create("thread_slab", sizeof(thread_t), 0,
+        thread_slab = slab_cache_create("thread_t", sizeof(thread_t), 0,
             thr_constructor, thr_destructor, 0);
         
 #ifdef CONFIG_FPU
-        fpu_context_slab = slab_cache_create("fpu_slab", sizeof(fpu_context_t),
-            FPU_CONTEXT_ALIGN, NULL, NULL, 0);
+        fpu_context_slab = slab_cache_create("fpu_context_t",
+            sizeof(fpu_context_t), FPU_CONTEXT_ALIGN, NULL, NULL, 0);
 #endif
         
@@ -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--;
 }
 
@@ -854 +873 @@
          * In case of failure, kernel_uarg will be deallocated in this function.
          * In case of success, kernel_uarg will be freed in uinit().
-         *
          */
         uspace_arg_t *kernel_uarg =
@@ -866 +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) {