Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

backport fix from r87741 related to the issue6643 fix in r87727.

This commit is contained in:
Gregory P. Smith 2011-01-04 18:43:54 +00:00
parent 2b79a81461
commit c87620286d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/threading.py
View File

@ -456,7 +456,8 @@ class Thread(_Verbose):
def _reset_internal_locks(self):
# private! Called by _after_fork() to reset our internal locks as
# they may be in an invalid state leading to a deadlock or crash.
self.__block.__init__()
if hasattr(self, '_Thread__block'): # DummyThread deletes self.__block
self.__block.__init__()
self.__started._reset_internal_locks()
@property
@ -884,7 +885,8 @@ def _after_fork():
thread._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()
if hasattr(thread, '_reset_internal_locks'):
thread._reset_internal_locks()
new_active[ident] = thread
else:
# All the others are already stopped.