don't use pthread_exit. switch to primorial thread and return normally

toffaletti · Nov 30, 2011 · f0ebf18 · f0ebf18
1 parent 930a93c
commit f0ebf18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/examples/threaded.c b/examples/threaded.c
@@ -54,7 +54,5 @@ int main(int argc, char *argv[]) {
     }
 
     st_thread_exit(NULL);
-    printf("does not happen\n");
-
-    return 1;
+    return 0;
 }
diff --git a/sched.c b/sched.c
@@ -239,14 +239,11 @@ void *_st_idle_thread_start(void *arg)
     _ST_SWITCH_CONTEXT(me);
   }
 
+  _ST_RESTORE_CONTEXT(_st_this_vp.primorial_thread);
   /* No more threads */
   free(_st_this_vp.primorial_thread);
   /* Free resources in use by event system */
   (*_st_eventsys->free)();
-
-  pthread_exit(NULL);
-
-  /* NOTREACHED */
   return NULL;
 }
 
@@ -288,10 +285,10 @@ void st_thread_exit(void *retval)
     _st_stack_free(thread->stack);
   }
 
-
   /* Find another thread to run */
   _ST_SWITCH_CONTEXT(thread);
-  /* Not going to land here */
+  free(thread);
+  (*_st_eventsys->free)();
 }