ez-a-sync 0.32.11__cp310-cp310-macosx_11_0_arm64.whl → 0.32.13__cp310-cp310-macosx_11_0_arm64.whl

a_sync/primitives/locks/prio_semaphore.pxd

@@ -1,11 +1,12 @@
 from a_sync.primitives.locks.semaphore cimport Semaphore
 
 cdef class _AbstractPrioritySemaphore(Semaphore):
-    cdef dict[object, _AbstractPrioritySemaphoreContextManager] _context_managers
-    cdef Py_ssize_t _capacity
-    cdef list _potential_lost_waiters
-    cdef object _top_priority
-    cdef object _context_manager_class
+    cdef readonly dict[object, _AbstractPrioritySemaphoreContextManager] _context_managers
+    cdef readonly Py_ssize_t _capacity
+    cdef readonly set _potential_lost_waiters
+    cdef readonly object _top_priority
+    cdef readonly _AbstractPrioritySemaphoreContextManager _top_priority_manager
+    cdef readonly object _context_manager_class
     cpdef object acquire(self)
     cdef _AbstractPrioritySemaphoreContextManager c_getitem(self, object priority)
     cdef dict[object, int] _count_waiters(self)
@@ -15,9 +16,9 @@ cdef class PrioritySemaphore(_AbstractPrioritySemaphore):
     pass
 
 cdef class _AbstractPrioritySemaphoreContextManager(Semaphore):
-    cdef _AbstractPrioritySemaphore _parent
-    cdef object _priority
-    cdef str _priority_name
+    cdef readonly _AbstractPrioritySemaphore _parent
+    cdef readonly object _priority
+    cdef readonly str _priority_name
     cpdef str _repr_no_parent_(self)
 
 cdef class _PrioritySemaphoreContextManager(_AbstractPrioritySemaphoreContextManager):

a_sync/primitives/locks/prio_semaphore.pyx

@@ -11,11 +11,10 @@ import heapq
 from logging import getLogger
 from typing import List, Literal, Optional, Protocol, Set, Type, TypeVar
 
+from cpython.unicode cimport PyUnicode_CompareWithASCIIString
+
 from a_sync.primitives.locks.semaphore cimport Semaphore
 
-# cdef asyncio
-cdef object Future = asyncio.Future
-del asyncio
 
 # cdef collections
 cdef object deque = collections.deque
@@ -65,7 +64,7 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
         """A heap queue of context managers, sorted by priority."""
 
         # NOTE: This should (hopefully) be temporary
-        self._potential_lost_waiters: List["Future[None]"] = []
+        self._potential_lost_waiters = set()
         """A list of futures representing waiters that might have been lost."""
     
     def __init__(
@@ -92,6 +91,9 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
         """The initial capacity of the semaphore."""
 
         self._top_priority = top_priority
+        self._top_priority_manager = context_manager_class(
+                self, top_priority, name=self.name
+            )
         self._context_manager_class = context_manager_class
 
     def __repr__(self) -> str:
@@ -108,7 +110,7 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
             >>> async with semaphore:
             ...     await do_stuff()
         """
-        await self.c_getitem(self._top_priority).acquire()
+        await self._top_priority_manager.acquire()
 
     async def __aexit__(self, *_) -> None:
         """Exits the semaphore context, releasing it with the top priority.
@@ -120,7 +122,7 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
             >>> async with semaphore:
             ...     await do_stuff()
         """
-        self.c_getitem(self._top_priority).release()
+        self._top_priority_manager.release()
 
     cpdef object acquire(self):
         """Acquires the semaphore with the top priority.
@@ -131,7 +133,7 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
             >>> semaphore = _AbstractPrioritySemaphore(5)
             >>> await semaphore.acquire()
         """
-        return self.c_getitem(self._top_priority).acquire()
+        return self._top_priority_manager.acquire()
 
     def __getitem__(
         self, priority: Optional[PT]
@@ -154,8 +156,10 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
         cdef _AbstractPrioritySemaphoreContextManager context_manager
         cdef dict[object, _AbstractPrioritySemaphoreContextManager] context_managers
 
+        if priority is None or priority == self._top_priority:
+            return self._top_priority_manager
+        
         context_managers = self._context_managers
-        priority = self._top_priority if priority is None else priority
         context_manager = context_managers.get(priority)
         if context_manager is None:
             context_manager = self._context_manager_class(
@@ -213,12 +217,36 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
             >>> semaphore._wake_up_next()
         """
         cdef _AbstractPrioritySemaphoreContextManager manager
+        cdef object manager_waiters, get_next
         cdef Py_ssize_t start_len, end_len
-        cdef bint woke_up
+        cdef set potential_lost_waiters
+        cdef bint woke_up, debug_logs
+
+        manager = self._top_priority_manager
+        manager_waiters = manager._Semaphore__waiters
+        potential_lost_waiters = self._potential_lost_waiters
+        debug_logs = _logger_is_enabled(DEBUG)
+        if manager_waiters:
+            get_next = manager_waiters.popleft
+            while manager_waiters:
+                waiter = get_next()
+                potential_lost_waiters.discard(waiter)
+                if _is_not_done(waiter):
+                    waiter.set_result(None)
+                    if debug_logs:
+                        log_debug("woke up %s", (waiter, ))
+                    return
+        
+        while manager_waiters:
+            waiter = get_next()
+            potential_lost_waiters.discard(waiter)
+            if _is_not_done(waiter):
+                waiter.set_result(None)
+                if debug_logs:
+                    log_debug("woke up %s", (waiter, ))
+                return
 
         cdef list self_waiters = self._Semaphore__waiters
-        cdef list potential_lost_waiters = self._potential_lost_waiters
-        cdef bint debug_logs = _logger_is_enabled(DEBUG)
         while self_waiters:
             manager = heappop(self_waiters)
             if len(manager) == 0:
@@ -240,9 +268,10 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
                 if not manager_waiters:
                     log_debug("not manager._Semaphore__waiters", ())
 
-            while manager_waiters:
-                waiter = manager_waiters.popleft()
-                potential_lost_waiters.remove(waiter)
+            if manager_waiters:
+                get_next = manager_waiters.popleft
+                waiter = get_next()
+                potential_lost_waiters.discard(waiter)
                 if _is_not_done(waiter):
                     waiter.set_result(None)
                     woke_up = True
@@ -250,6 +279,17 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
                         log_debug("woke up %s", (waiter, ))
                     break
 
+                if not woke_up:
+                    while manager_waiters:
+                        waiter = get_next()
+                        potential_lost_waiters.discard(waiter)
+                        if _is_not_done(waiter):
+                            waiter.set_result(None)
+                            woke_up = True
+                            if debug_logs:
+                                log_debug("woke up %s", (waiter, ))
+                            break
+
             if not woke_up:
                 self._context_managers.pop(manager._priority)
                 continue
@@ -269,14 +309,14 @@ cdef class _AbstractPrioritySemaphore(Semaphore):
         # emergency procedure (hopefully temporary):
         if not debug_logs:
             while potential_lost_waiters:
-                waiter = potential_lost_waiters.pop(0)
+                waiter = potential_lost_waiters.pop()
                 if _is_not_done(waiter):
                     waiter.set_result(None)
                     return
             return
             
         while potential_lost_waiters:
-            waiter = potential_lost_waiters.pop(0)
+            waiter = potential_lost_waiters.pop()
             log_debug("we found a lost waiter %s", (waiter, ))
             if _is_not_done(waiter):
                 waiter.set_result(None)
@@ -393,7 +433,7 @@ cdef class _AbstractPrioritySemaphoreContextManager(Semaphore):
                 self._Semaphore__waiters = deque()
             fut = self._c_get_loop().create_future()
             self._Semaphore__waiters.append(fut)
-            parent._potential_lost_waiters.append(fut)
+            parent._potential_lost_waiters.add(fut)
             try:
                 await fut
             except:
@@ -417,11 +457,14 @@ cdef class _AbstractPrioritySemaphoreContextManager(Semaphore):
         self._parent.release()
 
 
-cdef inline bint _is_not_done(fut: Future):
-    return <str>fut._state == "PENDING"
+cdef inline bint _is_not_done(fut: asyncio.Future):
+    return PyUnicode_CompareWithASCIIString(fut._state, b"PENDING") == 0
+
+cdef inline bint _is_not_cancelled(fut: asyncio.Future):
+    return PyUnicode_CompareWithASCIIString(fut._state, b"CANCELLED") != 0
 
-cdef inline bint _is_not_cancelled(fut: Future):
-    return <str>fut._state != "CANCELLED"
+
+del asyncio
 
 
 cdef class _PrioritySemaphoreContextManager(_AbstractPrioritySemaphoreContextManager):
@@ -505,7 +548,7 @@ cdef class PrioritySemaphore(_AbstractPrioritySemaphore):
         """A heap queue of context managers, sorted by priority."""
 
         # NOTE: This should (hopefully) be temporary
-        self._potential_lost_waiters: List["Future[None]"] = []
+        self._potential_lost_waiters = set()
         """A list of futures representing waiters that might have been lost."""
     
     def __init__(