From 0c759febb660ad3dabc976383e24c28658dfda39 Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 27 Apr 2011 19:28:05 +0200
Subject: [PATCH] =?UTF-8?q?Issue=20#10517:=20After=20fork(),=20reinitializ?=
 =?UTF-8?q?e=20the=20TLS=20used=20by=20the=20PyGILState=5F*=20APIs,=20to?=
 =?UTF-8?q?=20avoid=20a=20crash=20with=20the=20pthread=20implementation=20?=
 =?UTF-8?q?in=20RHEL=205.=20=20Patch=20by=20Charles-Fran=C3=A7ois=20Natali?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Include/pystate.h      |  1 +
 Misc/NEWS              |  4 ++++
 Modules/signalmodule.c |  1 +
 Python/pystate.c       | 17 +++++++++++++++++
 4 files changed, 23 insertions(+)

diff --git a/Include/pystate.h b/Include/pystate.h
index 50245c2c0ad..9f876e98c4f 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);
diff --git a/Misc/NEWS b/Misc/NEWS
index 005527f1cee..5b150e79c4a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 d34f13246e9..00a83b497cd 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 922e9a37802..586b856603f 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