[Python-checkins] cpython (merge 2.7 -> 2.7): Merge.

[charles-francois.natali]

http://hg.python.org/cpython/rev/6292312c5a29
changeset:   72898:6292312c5a29
branch:      2.7
parent:      72844:70178bad66b0
parent:      72897:ee4fe16d9b48
user:        Charles-François Natali <neologix at free.fr>
date:        Wed Oct 12 21:10:02 2011 +0200
summary:
  Merge.

files:
  Include/pystate.h      |   1 -
  Modules/signalmodule.c |   1 -
  Python/pystate.c       |  17 -----------------
  3 files changed, 0 insertions(+), 19 deletions(-)


diff --git a/Include/pystate.h b/Include/pystate.h
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -111,7 +111,6 @@
 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
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -976,7 +976,6 @@
 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
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -537,23 +537,6 @@
     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

-- 
Repository URL: http://hg.python.org/cpython