mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 19:25:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 64212 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2008-06-13 00:26:50 +00:00
parent 762681b515
commit e68df0fbe5
4 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Include/pythread.h
View file

@ -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_get_key_value(int);
PyAPI_FUNC(void) PyThread_delete_key_value(int key); PyAPI_FUNC(void) PyThread_delete_key_value(int key);
/* Cleanup after a fork */
PyAPI_FUNC(void) PyThread_ReInitTLS(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

1
Modules/signalmodule.c
View file

@ -941,5 +941,6 @@ PyOS_AfterFork(void)
main_thread = PyThread_get_thread_ident(); main_thread = PyThread_get_thread_ident();
main_pid = getpid(); main_pid = getpid();
_PyImport_ReInitLock(); _PyImport_ReInitLock();
PyThread_ReInitTLS();
#endif #endif
} }

2
Parser/intrcheck.c
View file

@ -2,6 +2,7 @@
/* Check for interrupts */ /* Check for interrupts */
#include "Python.h" #include "Python.h"
#include "pythread.h"
#ifdef QUICKWIN #ifdef QUICKWIN
@ -168,5 +169,6 @@ PyOS_AfterFork(void)
{ {
#ifdef WITH_THREAD #ifdef WITH_THREAD
PyEval_ReInitThreads(); PyEval_ReInitThreads();
PyThread_ReInitTLS();
#endif #endif
} }

31
Python/thread.c
View file

@ -377,4 +377,35 @@ PyThread_delete_key_value(int key)
PyThread_release_lock(keymutex); 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 */ #endif /* Py_HAVE_NATIVE_TLS */