Changes in kernel/generic/src/proc/thread.c [95d45482:aab5e46] 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>
@@ -67 +69 @@
 #include <syscall/copy.h>
 #include <errno.h>
-#include <debug.h>
 
 /** Thread states */
@@ -165 +166 @@
 
 #ifdef CONFIG_FPU
-        thread->saved_fpu_context = slab_alloc(fpu_context_cache,
-            FRAME_ATOMIC | kmflags);
+#ifdef CONFIG_FPU_LAZY
+        thread->saved_fpu_context = NULL;
+#else /* CONFIG_FPU_LAZY */
+        thread->saved_fpu_context = slab_alloc(fpu_context_cache, kmflags);
         if (!thread->saved_fpu_context)
                 return ENOMEM;
+#endif /* CONFIG_FPU_LAZY */
 #endif /* CONFIG_FPU */
 
@@ -190 +194 @@
         kmflags &= ~FRAME_HIGHMEM;
 
-        // NOTE: All kernel stacks must be aligned to STACK_SIZE,
-        //       see get_stack_base().
+        // XXX: All kernel stacks must be aligned to STACK_SIZE,
+        //      see get_stack_base().
 
         uintptr_t stack_phys =
@@ -197 +201 @@
         if (!stack_phys) {
 #ifdef CONFIG_FPU
-                assert(thread->saved_fpu_context);
-                slab_free(fpu_context_cache, thread->saved_fpu_context);
+                if (thread->saved_fpu_context)
+                        slab_free(fpu_context_cache, thread->saved_fpu_context);
 #endif
                 return ENOMEM;
@@ -223 +227 @@
 
 #ifdef CONFIG_FPU
-        assert(thread->saved_fpu_context);
-        slab_free(fpu_context_cache, thread->saved_fpu_context);
+        if (thread->saved_fpu_context)
+                slab_free(fpu_context_cache, thread->saved_fpu_context);
 #endif
 
@@ -268 +272 @@
 {
         assert(irq_spinlock_locked(&thread->lock));
+        workq_before_thread_is_ready(thread);
 }
 
@@ -339 +344 @@
     thread_flags_t flags, const char *name)
 {
-        thread_t *thread = (thread_t *) slab_alloc(thread_cache, FRAME_ATOMIC);
+        thread_t *thread = (thread_t *) slab_alloc(thread_cache, 0);
         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;
@@ -409 +411 @@
         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)
@@ -653 +660 @@
 
         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.
 }