Patch #716969: Detect thread creation failure. Will backport to 2.2.

loewis · loewis · commit 910ae6283a2e · 2003-04-19T07:44:52.000Z
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
@@ -188,7 +188,7 @@ long
 PyThread_start_new_thread(void (*func)(void *), void *arg)
 {
 	pthread_t th;
-	int success;
+	int status;
  	sigset_t oldmask, newmask;
 #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
 	pthread_attr_t attrs;
@@ -214,7 +214,7 @@ PyThread_start_new_thread(void (*func)(void *), void *arg)
 	sigfillset(&newmask);
 	SET_THREAD_SIGMASK(SIG_BLOCK, &newmask, &oldmask);
 
-	success = pthread_create(&th, 
+	status = pthread_create(&th, 
 #if defined(PY_PTHREAD_D4)
 				 pthread_attr_default,
 				 (pthread_startroutine_t)func, 
@@ -244,13 +244,15 @@ PyThread_start_new_thread(void (*func)(void *), void *arg)
 #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
 	pthread_attr_destroy(&attrs);
 #endif
-	if (success == 0) {
+	if (status != 0)
+            return -1;
+
 #if defined(PY_PTHREAD_D4) || defined(PY_PTHREAD_D6) || defined(PY_PTHREAD_D7)
-		pthread_detach(&th);
+        pthread_detach(&th);
 #elif defined(PY_PTHREAD_STD)
-		pthread_detach(th);
+        pthread_detach(th);
 #endif
-	}
+
 #if SIZEOF_PTHREAD_T <= SIZEOF_LONG
 	return (long) th;
 #else
diff --git a/Python/thread_solaris.h b/Python/thread_solaris.h
@@ -40,8 +40,6 @@ PyThread_start_new_thread(void (*func)(void *), void *arg)
 {
 	thread_t tid;
 	struct func_arg *funcarg;
-	int success = 0;	/* init not needed when SOLARIS_THREADS and */
-				/* C_THREADS implemented properly */
 
 	dprintf(("PyThread_start_new_thread called\n"));
 	if (!initialized)
@@ -53,7 +51,7 @@ PyThread_start_new_thread(void (*func)(void *), void *arg)
 		       THR_DETACHED | THR_NEW_LWP, &tid)) {
 		perror("thr_create");
 		free((void *) funcarg);
-		success = -1;
+		return -1;
 	}
 	return tid;
 }

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ PyThread_start_new_thread(void (func)(void ), void *arg)`
`40`	`40`	`{`
`41`	`41`	`thread_t tid;`
`42`	`42`	`struct func_arg *funcarg;`
`43`		`- int success = 0; /* init not needed when SOLARIS_THREADS and */`
`44`		`- /* C_THREADS implemented properly */`
`45`	`43`
`46`	`44`	`dprintf(("PyThread_start_new_thread called\n"));`
`47`	`45`	`if (!initialized)`
`@@ -53,7 +51,7 @@ PyThread_start_new_thread(void (func)(void ), void *arg)`
`53`	`51`	`THR_DETACHED \| THR_NEW_LWP, &tid)) {`
`54`	`52`	`perror("thr_create");`
`55`	`53`	`free((void *) funcarg);`
`56`		`- success = -1;`
	`54`	`+ return -1;`
`57`	`55`	`}`
`58`	`56`	`return tid;`
`59`	`57`	`}`