gh-97545: Make Semaphore run faster. (GH-97549)

(cherry picked from commit 68c46ae68b6e0c36a12e37285fff9ce0782ed01e)

Co-authored-by: Cyker Way <cykerway@gmail.com>

diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py
index fc03830b949df2cc504a05a15edf1beb9af1d2dd..e192159127a3f602b5649e9a4a48e841e572ec00 100644 (file)
--- a/Lib/asyncio/locks.py
+++ b/Lib/asyncio/locks.py
@@ -360,8 +360,9 @@ class Semaphore(_ContextManagerMixin, mixins._LoopBoundMixin):
         return f'<{res[1:-1]} [{extra}]>'
 
     def locked(self):
-        """Returns True if semaphore counter is zero."""
-        return self._value == 0
+        """Returns True if semaphore cannot be acquired immediately."""
+        return self._value == 0 or (
+            any(not w.cancelled() for w in (self._waiters or ())))
 
     async def acquire(self):
         """Acquire a semaphore.
@@ -372,8 +373,7 @@ class Semaphore(_ContextManagerMixin, mixins._LoopBoundMixin):
         called release() to make it larger than 0, and then return
         True.
         """
-        if (not self.locked() and (self._waiters is None or
-                all(w.cancelled() for w in self._waiters))):
+        if not self.locked():
             self._value -= 1
             return True
 
@@ -391,13 +391,13 @@ class Semaphore(_ContextManagerMixin, mixins._LoopBoundMixin):
             finally:
                 self._waiters.remove(fut)
         except exceptions.CancelledError:
-            if not self.locked():
-                self._wake_up_first()
+            if not fut.cancelled():
+                self._value += 1
+                self._wake_up_next()
             raise
 
-        self._value -= 1
-        if not self.locked():
-            self._wake_up_first()
+        if self._value > 0:
+            self._wake_up_next()
         return True
 
     def release(self):
@@ -407,22 +407,18 @@ class Semaphore(_ContextManagerMixin, mixins._LoopBoundMixin):
         become larger than zero again, wake up that coroutine.
         """
         self._value += 1
-        self._wake_up_first()
+        self._wake_up_next()
 
-    def _wake_up_first(self):
-        """Wake up the first waiter if it isn't done."""
+    def _wake_up_next(self):
+        """Wake up the first waiter that isn't done."""
         if not self._waiters:
             return
-        try:
-            fut = next(iter(self._waiters))
-        except StopIteration:
-            return
 
-        # .done() necessarily means that a waiter will wake up later on and
-        # either take the lock, or, if it was cancelled and lock wasn't
-        # taken already, will hit this again and wake up a new waiter.
-        if not fut.done():
-            fut.set_result(True)
+        for fut in self._waiters:
+            if not fut.done():
+                self._value -= 1
+                fut.set_result(True)
+                return
 
 
 class BoundedSemaphore(Semaphore):

diff --git a/Lib/test/test_asyncio/test_locks.py b/Lib/test/test_asyncio/test_locks.py
index c539267451668b2d47de7bd0db84d43fcbba8cef..50aed902325447c4d0981aa9cfb9f076bb00521f 100644 (file)
--- a/Lib/test/test_asyncio/test_locks.py
+++ b/Lib/test/test_asyncio/test_locks.py
@@ -857,9 +857,8 @@ class SemaphoreTests(unittest.IsolatedAsyncioTestCase):
 
         sem.release()
         sem.release()
-        self.assertEqual(2, sem._value)
+        self.assertEqual(0, sem._value)
 
-        await asyncio.sleep(0)
         await asyncio.sleep(0)
         self.assertEqual(0, sem._value)
         self.assertEqual(3, len(result))

diff --git a/Misc/NEWS.d/next/Library/2022-09-25-23-24-52.gh-issue-97545.HZLSNt.rst b/Misc/NEWS.d/next/Library/2022-09-25-23-24-52.gh-issue-97545.HZLSNt.rst
new file mode 100644 (file)
index 0000000..a53902e
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-09-25-23-24-52.gh-issue-97545.HZLSNt.rst
@@ -0,0 +1 @@
+Make Semaphore run faster.