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

Sun Dec 18 19:32:52 CET 2011

http://hg.python.org/cpython/rev/a175284ede57
changeset: 74048:a175284ede57
branch: 3.2
parent: 74047:c478734ded4b
parent: 74037:de962ec0faaa
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sun Dec 18 19:28:33 2011 +0100
summary:
 Merge
files:
 Lib/threading.py | 11 ++++-------
 Misc/NEWS | 3 +++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Lib/threading.py b/Lib/threading.py
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1068,21 +1068,18 @@
 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -100,6 +100,9 @@
 - Issue #7502: Fix equality comparison for DocTestCase instances. Patch by
 Cédric Krier.
 
+- 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.
 
-- 
Repository URL: http://hg.python.org/cpython
