diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-04-27 17:28:05 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-04-27 17:28:05 (GMT) |
| commit | 0c759febb660ad3dabc976383e24c28658dfda39 (patch) | |
| tree | 665621563310f3c1b81062b65c149722e3c85a67 | |
| parent | 43ae619925cbcee7b59c3c370829a053fef40acb (diff) | |
| download | cpython-0c759febb660ad3dabc976383e24c28658dfda39.zip cpython-0c759febb660ad3dabc976383e24c28658dfda39.tar.gz cpython-0c759febb660ad3dabc976383e24c28658dfda39.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.
| -rw-r--r-- | Include/pystate.h | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 1 | ||||
| -rw-r--r-- | Python/pystate.c | 17 |
4 files changed, 23 insertions, 0 deletions
diff --git a/Include/pystate.h b/Include/pystate.h index 50245c2..9f876e9 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -131,6 +131,7 @@ PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *); PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); #ifdef WITH_THREAD PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); +PyAPI_FUNC(void) _PyGILState_Reinit(void); #endif PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); @@ -10,6 +10,10 @@ What's New in Python 3.2.1? Core and Builtins ----------------- +- 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. + - Issue #6780: fix starts/endswith error message to mention that tuples are accepted too. diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index d34f132..00a83b4 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -991,6 +991,7 @@ void PyOS_AfterFork(void) { #ifdef WITH_THREAD + _PyGILState_Reinit(); PyEval_ReInitThreads(); main_thread = PyThread_get_thread_ident(); main_pid = getpid(); diff --git a/Python/pystate.c b/Python/pystate.c index 922e9a3..586b856 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -585,6 +585,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 |