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

toffaletti · toffaletti · commit f0ebf18d8fb0 · 2011-11-30T08:00:18.000-08:00
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)();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -239,14 +239,11 @@ void _st_idle_thread_start(void arg)`
`239`	`239`	`_ST_SWITCH_CONTEXT(me);`
`240`	`240`	`}`
`241`	`241`
	`242`	`+ _ST_RESTORE_CONTEXT(_st_this_vp.primorial_thread);`
`242`	`243`	`/* No more threads */`
`243`	`244`	`free(_st_this_vp.primorial_thread);`
`244`	`245`	`/* Free resources in use by event system */`
`245`	`246`	`(*_st_eventsys->free)();`
`246`		`-`
`247`		`- pthread_exit(NULL);`
`248`		`-`
`249`		`- /* NOTREACHED */`
`250`	`247`	`return NULL;`
`251`	`248`	`}`
`252`	`249`
`@@ -288,10 +285,10 @@ void st_thread_exit(void *retval)`
`288`	`285`	`_st_stack_free(thread->stack);`
`289`	`286`	`}`
`290`	`287`
`291`		`-`
`292`	`288`	`/* Find another thread to run */`
`293`	`289`	`_ST_SWITCH_CONTEXT(thread);`
`294`		`- /* Not going to land here */`
	`290`	`+ free(thread);`
	`291`	`+ (*_st_eventsys->free)();`
`295`	`292`	`}`
`296`	`293`
`297`	`294`