diff options
| author | Charles-François Natali <neologix@free.fr> | 2011-10-12 19:10:02 (GMT) |
|---|---|---|
| committer | Charles-François Natali <neologix@free.fr> | 2011-10-12 19:10:02 (GMT) |
| commit | 46180751e92bfb45dfe2c324210825db7937e5e7 (patch) | |
| tree | c58a2767127a82fa86928e8c7a49783e386b81c3 | |
| parent | 7c4b0475ec2796ed71b6cc5cc7aad0fb525de1e8 (diff) | |
| parent | 1f3ff7bc3f7cfd4e823e49dc193ab7fecb767c43 (diff) | |
| download | cpython-46180751e92bfb45dfe2c324210825db7937e5e7.zip cpython-46180751e92bfb45dfe2c324210825db7937e5e7.tar.gz cpython-46180751e92bfb45dfe2c324210825db7937e5e7.tar.bz2 | |
Merge.
| -rw-r--r-- | Include/pystate.h | 1 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 1 | ||||
| -rw-r--r-- | Python/pystate.c | 17 |
3 files changed, 0 insertions, 19 deletions
diff --git a/Include/pystate.h b/Include/pystate.h index 63371fa..8d74940 100644 --- a/Include/pystate.h +++ b/Include/pystate.h @@ -111,7 +111,6 @@ 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); diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 6f021e7..f306bba 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -976,7 +976,6 @@ 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 3eefa36..ddb7d42 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -537,23 +537,6 @@ _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 |