Changeset e29e09cf in mainline for uspace/lib/c/generic/thread.c

Timestamp:

2011-02-04T21:00:56Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

474afc9, 960ff451

Parents:

400575c5 (diff), 17aca1c (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:

• uspace/lib/c/generic/thread.c (modified) (4 diffs)

uspace/lib/c/generic/thread.c

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
 #include <thread.h>
@@ -41 +41 @@
 #include <str.h>
 #include <async.h>
+#include "private/thread.h"
 
 #ifndef THREAD_INITIAL_STACK_PAGES_NO
@@ -50 +51 @@
  * This function is called from __thread_entry() and is used
  * to call the thread's implementing function and perform cleanup
- * and exit when thread returns back. Do not call this function
- * directly.
+ * and exit when thread returns back.
  *
  * @param uarg Pointer to userspace argument structure.
+ *
  */
 void __thread_main(uspace_arg_t *uarg)
 {
-        fibril_t *f;
-
-        f = fibril_setup();
-        __tcb_set(f->tcb);
-
+        fibril_t *fibril = fibril_setup();
+        if (fibril == NULL)
+                thread_exit(0);
+        
+        __tcb_set(fibril->tcb);
+        
         uarg->uspace_thread_function(uarg->uspace_thread_arg);
-        /* XXX: we cannot free the userspace stack while running on it */
-//      free(uarg->uspace_stack);
-//      free(uarg);
-
+        /* XXX: we cannot free the userspace stack while running on it
+                free(uarg->uspace_stack);
+                free(uarg);
+        */
+        
         /* If there is a manager, destroy it */
         async_destroy_manager();
-        fibril_teardown(f);
-
+        fibril_teardown(fibril);
+        
         thread_exit(0);
 }
@@ -127 +130 @@
  *
  * @param status Exit status. Currently not used.
+ *
  */
 void thread_exit(int status)
 {
         __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status);
-        for (;;)
-                ;
+        
+        /* Unreachable */
+        while (1);
 }