diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-04-27 17:20:48 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-04-27 17:20:48 (GMT) |
| commit | 4394e0db24f38250d487adcbd8b85f314cb86829 (patch) | |
| tree | 780b649028ce241a21af7f595b84b6f8db1d719b /Python | |
| parent | 34b32d62f85f198ca0c92b367e04a08febb87532 (diff) | |
| download | cpython-4394e0db24f38250d487adcbd8b85f314cb86829.zip cpython-4394e0db24f38250d487adcbd8b85f314cb86829.tar.gz cpython-4394e0db24f38250d487adcbd8b85f314cb86829.tar.bz2 | |
Issue #10517: After fork(), reinitialize the TLS used by the PyGILState_*
APIs, to avoid a crash with the pthread implementation in RHEL 5. Patch
by Charles-François Natali.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/pystate.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Python/pystate.c b/Python/pystate.c index ddb7d42..3eefa36 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -537,6 +537,23 @@ _PyGILState_Fini(void) autoInterpreterState = NULL; } +/* Reset the TLS key - called by PyOS_AfterFork. + * This should not be necessary, but some - buggy - pthread implementations + * don't flush TLS on fork, see issue #10517. + */ +void +_PyGILState_Reinit(void) +{ + PyThreadState *tstate = PyGILState_GetThisThreadState(); + PyThread_delete_key(autoTLSkey); + if ((autoTLSkey = PyThread_create_key()) == -1) + Py_FatalError("Could not allocate TLS entry"); + + /* re-associate the current thread state with the new key */ + if (PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0) + Py_FatalError("Couldn't create autoTLSkey mapping"); +} + /* When a thread state is created for a thread by some mechanism other than PyGILState_Ensure, it's important that the GILState machinery knows about it so it doesn't try to create another thread state for the thread (this is |