mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

[3.10] bpo-45997: Fix asyncio.Semaphore re-acquiring order (GH-31910) (#32047)

Browse source 
Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
(cherry picked from commit 32e77154dd)
Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
This commit is contained in:
Miss Islington (bot) 2022-03-22 08:15:24 -07:00 • committed by GitHub
parent c3538355f4
commit 9d59381a5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/asyncio/locks.py
View file

@ -6,6 +6,7 @@ import collections
from . import exceptions
from . import mixins
from . import tasks
class _ContextManagerMixin:
@ -350,6 +351,7 @@ class Semaphore(_ContextManagerMixin, mixins._LoopBoundMixin):
raise ValueError("Semaphore initial value must be >= 0")
self._value = value
self._waiters = collections.deque()
self._wakeup_scheduled = False
def __repr__(self):
res = super().__repr__()
@ -363,6 +365,7 @@ class Semaphore(_ContextManagerMixin, mixins._LoopBoundMixin):
waiter = self._waiters.popleft()
if not waiter.done():
waiter.set_result(None)
self._wakeup_scheduled = True
return
def locked(self):
@ -378,16 +381,17 @@ class Semaphore(_ContextManagerMixin, mixins._LoopBoundMixin):
called release() to make it larger than 0, and then return
True.
"""
while self._value <= 0:
# _wakeup_scheduled is set if *another* task is scheduled to wakeup
# but its acquire() is not resumed yet
while self._wakeup_scheduled or self._value <= 0:
fut = self._get_loop().create_future()
self._waiters.append(fut)
try:
await fut
except:
# See the similar code in Queue.get.
fut.cancel()
if self._value > 0 and not fut.cancelled():
self._wake_up_next()
# reset _wakeup_scheduled *after* waiting for a future
self._wakeup_scheduled = False
except exceptions.CancelledError:
self._wake_up_next()
raise
self._value -= 1
return True