Merged revisions 64212 via svnmerge from

benjaminp · benjaminp · commit e68df0fbe51f · 2008-06-13T00:26:50.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64212 | benjamin.peterson | 2008-06-12 19:09:47 -0500 (Thu, 12 Jun 2008) | 3 lines python#1683 prevent forking from interfering in threading storage This should prevent some test_multiprocessing failures ........
diff --git a/Include/pythread.h b/Include/pythread.h
@@ -40,6 +40,9 @@ PyAPI_FUNC(int) PyThread_set_key_value(int, void *);
 PyAPI_FUNC(void *) PyThread_get_key_value(int);
 PyAPI_FUNC(void) PyThread_delete_key_value(int key);
 
+/* Cleanup after a fork */
+PyAPI_FUNC(void) PyThread_ReInitTLS(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
@@ -941,5 +941,6 @@ PyOS_AfterFork(void)
 	main_thread = PyThread_get_thread_ident();
 	main_pid = getpid();
 	_PyImport_ReInitLock();
+	PyThread_ReInitTLS();
 #endif
 }
diff --git a/Parser/intrcheck.c b/Parser/intrcheck.c
@@ -2,6 +2,7 @@
 /* Check for interrupts */
 
 #include "Python.h"
+#include "pythread.h"
 
 #ifdef QUICKWIN
 
@@ -168,5 +169,6 @@ PyOS_AfterFork(void)
 {
 #ifdef WITH_THREAD
 	PyEval_ReInitThreads();
+	PyThread_ReInitTLS();
 #endif
 }
diff --git a/Python/thread.c b/Python/thread.c
@@ -377,4 +377,35 @@ PyThread_delete_key_value(int key)
 	PyThread_release_lock(keymutex);
 }
 
+/* Forget everything not associated with the current thread id.
+ * This function is called from PyOS_AfterFork().  It is necessary
+ * because other thread ids which were in use at the time of the fork
+ * may be reused for new threads created in the forked process.
+ */
+void
+PyThread_ReInitTLS(void)
+{
+	long id = PyThread_get_thread_ident();
+	struct key *p, **q;
+
+	if (!keymutex)
+		return;
+	
+	/* As with interpreter_lock in PyEval_ReInitThreads()
+	   we just create a new lock without freeing the old one */
+	keymutex = PyThread_allocate_lock();
+
+	/* Delete all keys which do not match the current thread id */
+	q = &keyhead;
+	while ((p = *q) != NULL) {
+		if (p->id != id) {
+			*q = p->next;
+			free((void *)p);
+			/* NB This does *not* free p->value! */
+		}
+		else
+			q = &p->next;
+	}
+}
+
 #endif /* Py_HAVE_NATIVE_TLS */

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,9 @@ PyAPI_FUNC(int) PyThread_set_key_value(int, void *);`
`40`	`40`	`PyAPI_FUNC(void *) PyThread_get_key_value(int);`
`41`	`41`	`PyAPI_FUNC(void) PyThread_delete_key_value(int key);`
`42`	`42`
	`43`	`+/* Cleanup after a fork */`
	`44`	`+PyAPI_FUNC(void) PyThread_ReInitTLS(void);`
	`45`	`+`
`43`	`46`	`#ifdef __cplusplus`
`44`	`47`	`}`
`45`	`48`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -941,5 +941,6 @@ PyOS_AfterFork(void)`
`941`	`941`	`main_thread = PyThread_get_thread_ident();`
`942`	`942`	`main_pid = getpid();`
`943`	`943`	`_PyImport_ReInitLock();`
	`944`	`+ PyThread_ReInitTLS();`
`944`	`945`	`#endif`
`945`	`946`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`/* Check for interrupts */`
`3`	`3`
`4`	`4`	`#include "Python.h"`
	`5`	`+#include "pythread.h"`
`5`	`6`
`6`	`7`	`#ifdef QUICKWIN`
`7`	`8`
`@@ -168,5 +169,6 @@ PyOS_AfterFork(void)`
`168`	`169`	`{`
`169`	`170`	`#ifdef WITH_THREAD`
`170`	`171`	`PyEval_ReInitThreads();`
	`172`	`+ PyThread_ReInitTLS();`
`171`	`173`	`#endif`
`172`	`174`	`}`