From d29feccec3ce3dcd9ab3100f8956171c70ec3027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Mon, 22 May 2017 22:23:05 -0700
Subject: [3.6] bpo-30395 _PyGILState_Reinit deadlock fix (GH-1734) (#1740)

head_lock could be held by another thread when fork happened. We should
reset it to avoid deadlock.
(cherry picked from commit f82c951d1c5416f3550d544e50ff5662d3836e73)
---
 Python/pystate.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Python/pystate.c')

diff --git a/Python/pystate.c b/Python/pystate.c
index 65c244e6f7..ccb0092c42 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -743,6 +743,10 @@ _PyGILState_Fini(void)
 void
 _PyGILState_Reinit(void)
 {
+#ifdef WITH_THREAD
+    head_mutex = NULL;
+    HEAD_INIT();
+#endif
     PyThreadState *tstate = PyGILState_GetThisThreadState();
     PyThread_delete_key(autoTLSkey);
     if ((autoTLSkey = PyThread_create_key()) == -1)
-- 
cgit v1.2.1