Changes in kernel/generic/src/proc/thread.c [897fd8f1:e7c4115d] in mainline

File:

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

kernel/generic/src/proc/thread.c

@@ -103 +103 @@
 static thread_id_t last_tid = 0;
 
-static slab_cache_t *thread_cache;
+static slab_cache_t *thread_slab;
 
 #ifdef CONFIG_FPU
-slab_cache_t *fpu_context_cache;
+slab_cache_t *fpu_context_slab;
 #endif
 
@@ -169 +169 @@
         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_slab, kmflags);
         if (!thread->saved_fpu_context)
-                return ENOMEM;
+                return -1;
 #endif /* CONFIG_FPU_LAZY */
 #endif /* CONFIG_FPU */
@@ -199 +199 @@
 #ifdef CONFIG_FPU
                 if (thread->saved_fpu_context)
-                        slab_free(fpu_context_cache, thread->saved_fpu_context);
-#endif
-                return ENOMEM;
+                        slab_free(fpu_context_slab, thread->saved_fpu_context);
+#endif
+                return -1;
         }
         
@@ -210 +210 @@
 #endif
         
-        return EOK;
+        return 0;
 }
 
@@ -225 +225 @@
 #ifdef CONFIG_FPU
         if (thread->saved_fpu_context)
-                slab_free(fpu_context_cache, thread->saved_fpu_context);
+                slab_free(fpu_context_slab, thread->saved_fpu_context);
 #endif
         
@@ -241 +241 @@
         
         atomic_set(&nrdy, 0);
-        thread_cache = slab_cache_create("thread_t", 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_cache = slab_cache_create("fpu_context_t",
+        fpu_context_slab = slab_cache_create("fpu_context_t",
             sizeof(fpu_context_t), FPU_CONTEXT_ALIGN, NULL, NULL, 0);
 #endif
@@ -341 +341 @@
     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_slab, 0);
         if (!thread)
                 return NULL;
@@ -457 +457 @@
          */
         task_release(thread->task);
-        slab_free(thread_cache, thread);
+        slab_free(thread_slab, thread);
 }
 
@@ -548 +548 @@
  * 
  * Threads that are blocked waiting for a synchronization primitive 
- * are woken up with a return code of EINTR if the
+ * are woken up with a return code of ESYNCH_INTERRUPTED if the
  * blocking call was interruptable. See waitq_sleep_timeout().
  * 
@@ -653 +653 @@
         irq_spinlock_unlock(&thread->lock, true);
         
-        return waitq_sleep_timeout(&thread->join_wq, usec, flags, NULL);
+        return waitq_sleep_timeout(&thread->join_wq, usec, flags);
 }
 
@@ -700 +700 @@
         waitq_initialize(&wq);
         
-        (void) waitq_sleep_timeout(&wq, usec, SYNCH_FLAGS_NON_BLOCKING, NULL);
+        (void) waitq_sleep_timeout(&wq, usec, SYNCH_FLAGS_NON_BLOCKING);
 }
 
@@ -974 +974 @@
                                  * We can safely deallocate it.
                                  */
-                                slab_free(thread_cache, thread);
+                                slab_free(thread_slab, thread);
                                 free(kernel_uarg);
                                 
@@ -1008 +1008 @@
 {
         thread_exit();
+        
+        /* Unreachable */
+        return 0;
 }