diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-04-27 19:20:48 +0200 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-04-27 19:20:48 +0200 |
| commit | 343260e6143bac261a17bc260593120b9156078c (patch) | |
| tree | eafd1cb75b4173ad9f51e73aadb69ff216218d33 | |
| parent | fd44bcb9cd589b3f34ed53625594d53787e7d0cc (diff) | |
| download | cpython-343260e6143bac261a17bc260593120b9156078c.tar.gz | |
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 b9fe61e721..729342ccbd 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -111,6 +111,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); @@ -61,6 +61,10 @@ Core and Builtins Library ------- +- 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 #11763: don't use difflib in TestCase.assertMultiLineEqual if the strings are too long. diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index f306bba16f..6f021e72e0 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -976,6 +976,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 ddb7d42589..3eefa36a26 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 |