mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Backed out changeset 1f5a7853680c

Browse source 
Unixy buildbots were failing the thread + fork tests :-(
This commit is contained in:
Tim Peters 2013-09-09 13:47:16 -05:00
parent 7a6054b19d
commit 7875523f16
1 changed files with 5 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Lib/threading.py
View file

@ -703,26 +703,6 @@ class Thread:
pass pass
def _stop(self): def _stop(self):
# After calling .stop(), .is_alive() returns False and .join() returns
# immediately. ._tstate_lock must be released before calling ._stop().
#
# Normal case: C code at the end of the thread's life
# (release_sentinel in _threadmodule.c) releases ._tstate_lock, and
# that's detected by our ._wait_for_tstate_lock(), called by .join()
# and .is_alive(). Any number of threads _may_ call ._stop()
# simultaneously (for example, if multiple threads are blocked in
# .join() calls), and they're not serialized. That's harmless -
# they'll just make redundant rebindings of ._is_stopped and
# ._tstate_lock. Obscure: we rebind ._tstate_lock last so that the
# "assert self._is_stopped" in ._wait_for_tstate_lock() always works
# (the assert is executed only if ._tstate_lock is None).
#
# Special case: _main_thread releases ._tstate_lock via this module's
# _shutdown() function.
tlock = self._tstate_lock
if tlock is not None:
# It's OK if multiple threads get in here (see above).
assert not tlock.locked()
self._is_stopped = True self._is_stopped = True
self._tstate_lock = None self._tstate_lock = None
@ -941,10 +921,9 @@ def _shutdown():
# the main thread's tstate_lock - that won't happen until the interpreter # the main thread's tstate_lock - that won't happen until the interpreter
# is nearly dead. So we release it here. Note that just calling _stop() # is nearly dead. So we release it here. Note that just calling _stop()
# isn't enough: other threads may already be waiting on _tstate_lock. # isn't enough: other threads may already be waiting on _tstate_lock.
tlock = _main_thread._tstate_lock assert _main_thread._tstate_lock is not None
assert tlock is not None assert _main_thread._tstate_lock.locked()
assert tlock.locked() _main_thread._tstate_lock.release()
tlock.release()
_main_thread._stop() _main_thread._stop()
t = _pickSomeNonDaemonThread() t = _pickSomeNonDaemonThread()
while t: while t: