Changes in kernel/generic/src/proc/thread.c [aab5e46:95d45482] in mainline

File:

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

kernel/generic/src/proc/thread.c

@@ -48 +48 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
-#include <synch/workqueue.h>
-#include <synch/rcu.h>
 #include <cpu.h>
 #include <str.h>
@@ -69 +67 @@
 #include <syscall/copy.h>
 #include <errno.h>
+#include <debug.h>
 
 /** Thread states */
@@ -166 +165 @@
 
 #ifdef CONFIG_FPU
-#ifdef CONFIG_FPU_LAZY
-        thread->saved_fpu_context = NULL;
-#else /* CONFIG_FPU_LAZY */
-        thread->saved_fpu_context = slab_alloc(fpu_context_cache, kmflags);
+        thread->saved_fpu_context = slab_alloc(fpu_context_cache,
+            FRAME_ATOMIC | kmflags);
         if (!thread->saved_fpu_context)
                 return ENOMEM;
-#endif /* CONFIG_FPU_LAZY */
 #endif /* CONFIG_FPU */
 
@@ -194 +190 @@
         kmflags &= ~FRAME_HIGHMEM;
 
-        // XXX: All kernel stacks must be aligned to STACK_SIZE,
-        //      see get_stack_base().
+        // NOTE: All kernel stacks must be aligned to STACK_SIZE,
+        //       see get_stack_base().
 
         uintptr_t stack_phys =
@@ -201 +197 @@
         if (!stack_phys) {
 #ifdef CONFIG_FPU
-                if (thread->saved_fpu_context)
-                        slab_free(fpu_context_cache, thread->saved_fpu_context);
+                assert(thread->saved_fpu_context);
+                slab_free(fpu_context_cache, thread->saved_fpu_context);
 #endif
                 return ENOMEM;
@@ -227 +223 @@
 
 #ifdef CONFIG_FPU
-        if (thread->saved_fpu_context)
-                slab_free(fpu_context_cache, thread->saved_fpu_context);
+        assert(thread->saved_fpu_context);
+        slab_free(fpu_context_cache, thread->saved_fpu_context);
 #endif
 
@@ -272 +268 @@
 {
         assert(irq_spinlock_locked(&thread->lock));
-        workq_before_thread_is_ready(thread);
 }
 
@@ -344 +339 @@
     thread_flags_t flags, const char *name)
 {
-        thread_t *thread = (thread_t *) slab_alloc(thread_cache, 0);
+        thread_t *thread = (thread_t *) slab_alloc(thread_cache, FRAME_ATOMIC);
         if (!thread)
                 return NULL;
+
+        if (thread_create_arch(thread, flags) != EOK) {
+                slab_free(thread_cache, thread);
+                return NULL;
+        }
 
         /* Not needed, but good for debugging */
@@ -399 +399 @@
         thread->task = task;
 
-        thread->workq = NULL;
-
         thread->fpu_context_exists = false;
         thread->fpu_context_engaged = false;
@@ -411 +409 @@
         udebug_thread_initialize(&thread->udebug);
 #endif
-
-        /* Might depend on previous initialization */
-        thread_create_arch(thread);
-
-        rcu_thread_init(thread);
 
         if ((flags & THREAD_FLAG_NOATTACH) != THREAD_FLAG_NOATTACH)
@@ -660 +653 @@
 
         return waitq_sleep_timeout(&thread->join_wq, usec, flags, NULL);
+
+        // FIXME: join should deallocate the thread.
+        //        Current code calls detach after join, that's contrary to how
+        //        join is used in other threading APIs.
 }