Issue #11870: threading: Properly reinitialize threads internal locks and

condition variables to avoid deadlocks in child processes.

diff --git a/Lib/threading.py b/Lib/threading.py
index 8d505b7d65d5d07fba4c56fc8bf5116d9b64f78a..2362be69b5b259b6d3f13ba52dc446a1efc45aa0 100644 (file)
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1047,21 +1047,18 @@ def _after_fork():
     current = current_thread()
     with _active_limbo_lock:
         for thread in _active.values():
+            # Any lock/condition variable may be currently locked or in an
+            # invalid state, so we reinitialize them.
+            thread._reset_internal_locks()
             if thread is current:
                 # There is only one active thread. We reset the ident to
                 # its new value since it can have changed.
                 ident = get_ident()
                 thread._ident = ident
-                # Any condition variables hanging off of the active thread may
-                # be in an invalid state, so we reinitialize them.
-                thread._reset_internal_locks()
                 new_active[ident] = thread
             else:
                 # All the others are already stopped.
-                # We don't call _Thread__stop() because it tries to acquire
-                # thread._Thread__block which could also have been held while
-                # we forked.
-                thread._stopped = True
+                thread._stop()
 
         _limbo.clear()
         _active.clear()

diff --git a/Misc/NEWS b/Misc/NEWS
index 85667cc4d31949d3122898a77cccfb7a19b5c6b7..2114c4bdc42f8db4cbef7bec333f80e28b389f70 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -419,6 +419,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11870: threading: Properly reinitialize threads internal locks and
+  condition variables to avoid deadlocks in child processes.
+
 - Issue #8035: urllib: Fix a bug where the client could remain stuck after a
   redirection or an error.