mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Issue #22185: Fix an occasional RuntimeError in threading.Condition.wait() caused by mutation of the waiters queue without holding the lock.
Patch by Doug Zongker.
This commit is contained in:
parent
6685883c02
commit
a64b92edd3
3 changed files with 11 additions and 5 deletions
|
@ -284,6 +284,7 @@ class Condition:
|
|||
waiter.acquire()
|
||||
self._waiters.append(waiter)
|
||||
saved_state = self._release_save()
|
||||
gotit = False
|
||||
try: # restore state no matter what (e.g., KeyboardInterrupt)
|
||||
if timeout is None:
|
||||
waiter.acquire()
|
||||
|
@ -293,14 +294,14 @@ class Condition:
|
|||
gotit = waiter.acquire(True, timeout)
|
||||
else:
|
||||
gotit = waiter.acquire(False)
|
||||
if not gotit:
|
||||
try:
|
||||
self._waiters.remove(waiter)
|
||||
except ValueError:
|
||||
pass
|
||||
return gotit
|
||||
finally:
|
||||
self._acquire_restore(saved_state)
|
||||
if not gotit:
|
||||
try:
|
||||
self._waiters.remove(waiter)
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
def wait_for(self, predicate, timeout=None):
|
||||
"""Wait until a condition evaluates to True.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue