summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2011-10-12 19:10:02 (GMT)
committerCharles-François Natali <neologix@free.fr>2011-10-12 19:10:02 (GMT)
commit46180751e92bfb45dfe2c324210825db7937e5e7 (patch)
treec58a2767127a82fa86928e8c7a49783e386b81c3 /Python
parent7c4b0475ec2796ed71b6cc5cc7aad0fb525de1e8 (diff)
parent1f3ff7bc3f7cfd4e823e49dc193ab7fecb767c43 (diff)
downloadcpython-46180751e92bfb45dfe2c324210825db7937e5e7.zip
cpython-46180751e92bfb45dfe2c324210825db7937e5e7.tar.gz
cpython-46180751e92bfb45dfe2c324210825db7937e5e7.tar.bz2
Merge.
Diffstat (limited to 'Python')
-rw-r--r--Python/pystate.c17
1 files changed, 0 insertions, 17 deletions
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