Merged revisions 64212 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64212 | benjamin.peterson | 2008-06-12 19:09:47 -0500 (Thu, 12 Jun 2008) | 3 lines

  #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
index f26db160bf4bea53cca0c9f564850c64ab52c7b3..b5a6ec38a6efda9608a739f11e432252a1d861bd 100644 (file)
--- 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
index 15cd9642b4cb5b175ccb0dca513ce7552536e640..e1904296aa7c1dc01b04108fae725ae44fffb4e9 100644 (file)
--- 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
index 5285dc562c6c50f278e5f89872140ae2f393f556..06b584024d03e45720cc049fea4f1f26c0394209 100644 (file)
--- 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
index f2da8c6b8a63e63a7c2a2fc7aa3ff25cb40cde19..41fa1e63139818bbe39a9301bfeb9d0e8fb39f28 100644 (file)
--- 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 */