Mercurial > cpython-lru_cache-weakref
diff Python/pystate.c @ 69635:f6feed6ec3f9 2.7
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.
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Wed, 27 Apr 2011 19:20:48 +0200 |
| parents | cd8d3c2d3bce |
| children | ee4fe16d9b48 |
line wrap: on
line diff
--- a/Python/pystate.c Wed Apr 27 09:45:46 2011 +0300 +++ b/Python/pystate.c Wed Apr 27 19:20:48 2011 +0200 @@ -537,6 +537,23 @@ 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