New thread.c from Sjoerd, supports _exit_prog(). Use this in goaway()

gvanrossum · gvanrossum · commit f9f2e82fcade · 1992-08-17T08:59:08.000Z
to avoid hanging in cleanup().
diff --git a/Include/pythread.h b/Include/pythread.h
@@ -10,6 +10,7 @@
 void init_thread _P((void));
 int start_new_thread _P((void (*)(void *), void *));
 void exit_thread _P((void));
+void _exit_thread _P((void));
 
 typedef void *type_lock;
 
@@ -20,7 +21,15 @@ int acquire_lock _P((type_lock, int));
 #define NOWAIT_LOCK	0
 void release_lock _P((type_lock));
 
+typedef void *type_sema;
+
+type_sema allocate_sema _P((int));
+void free_sema _P((type_sema));
+void down_sema _P((type_sema));
+void up_sema _P((type_sema));
+
 void exit_prog _P((int));
+void _exit_prog _P((int));
 
 #undef _P
 
diff --git a/Include/thread.h b/Include/thread.h
@@ -10,6 +10,7 @@
 void init_thread _P((void));
 int start_new_thread _P((void (*)(void *), void *));
 void exit_thread _P((void));
+void _exit_thread _P((void));
 
 typedef void *type_lock;
 
@@ -20,7 +21,15 @@ int acquire_lock _P((type_lock, int));
 #define NOWAIT_LOCK	0
 void release_lock _P((type_lock));
 
+typedef void *type_sema;
+
+type_sema allocate_sema _P((int));
+void free_sema _P((type_sema));
+void down_sema _P((type_sema));
+void up_sema _P((type_sema));
+
 void exit_prog _P((int));
+void _exit_prog _P((int));
 
 #undef _P
 
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
@@ -31,6 +31,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "thread.h"
 
+int threads_started = 0;
+
 object *ThreadError;
 
 
@@ -177,6 +179,8 @@ t_bootstrap(args_raw)
 	object *args = (object *) args_raw;
 	object *func, *arg, *res;
 
+	threads_started++;
+
 	restore_thread((void *)NULL);
 	func = gettupleitem(args, 0);
 	arg = gettupleitem(args, 1);
@@ -230,7 +234,7 @@ thread_exit_prog(self, args)
 	int sts;
 	if (!getargs(args, "i", &sts))
 		return NULL;
-	goaway(sts);
+	goaway(sts); /* Calls exit_prog(sts) or _exit_prog(sts) */
 	for (;;) { } /* Should not be reached */
 }
 
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -361,6 +361,10 @@ fatal(msg)
 
 /* Clean up and exit */
 
+#ifdef USE_THREAD
+extern int threads_started;
+#endif
+
 void
 goaway(sts)
 	int sts;
@@ -375,7 +379,10 @@ goaway(sts)
 	
 	(void) save_thread();
 	donecalls();
-	exit_prog(sts);
+	if (threads_started)
+		_exit_prog(sts);
+	else
+		exit_prog(sts);
 	
 #else /* USE_THREAD */
 	
diff --git a/Python/thread.c b/Python/thread.c
