remove: 🔥 Lock overuse

Author: remimd

injection/common/event.py

@@ -4,8 +4,6 @@
 from typing import ContextManager
 from weakref import WeakSet
 
-from injection.common.tools.threading import frozen_collection
-
 __all__ = ("Event", "EventChannel", "EventListener")
 
 
@@ -28,7 +26,7 @@ class EventChannel:
     @contextmanager
     def dispatch(self, event: Event) -> ContextManager | ContextDecorator:
         with ExitStack() as stack:
-            for listener in frozen_collection(self.__listeners):
+            for listener in tuple(self.__listeners):
                 context_manager = listener.on_event(event)
 
                 if context_manager is None:

injection/common/lazy.py

@@ -2,8 +2,6 @@
 from types import MappingProxyType
 from typing import Generic, TypeVar
 
-from injection.common.tools.threading import thread_lock
-
 __all__ = ("Lazy", "LazyMapping")
 
 _T = TypeVar("_T")
@@ -26,11 +24,9 @@ def is_set(self) -> bool:
 
     def __setup_cache(self, factory: Callable[[], _T]):
         def new_cache() -> Iterator[_T]:
-            with thread_lock:
-                self.__is_set = True
-
             nonlocal factory
             cached = factory()
+            self.__is_set = True
             del factory
 
             while True:

injection/common/queue.py

@@ -4,8 +4,6 @@
 from dataclasses import dataclass, field
 from typing import NoReturn, Protocol, TypeVar
 
-from injection.common.tools.threading import thread_lock
-
 __all__ = ("LimitedQueue",)
 
 _T = TypeVar("_T")
@@ -58,9 +56,7 @@ def __next__(self) -> _T:
         try:
             return next(self.__queue)
         except StopIteration as exc:
-            with thread_lock:
-                self.__queue = NoQueue()
-
+            self.__queue = NoQueue()
             raise exc
 
     def add(self, item: _T):

injection/common/tools/threading.py

@@ -1,28 +1,13 @@
-from collections.abc import Callable, Collection, Iterator
-from functools import wraps
+from contextlib import ContextDecorator, contextmanager
 from threading import RLock
-from typing import Any, TypeVar
+from typing import ContextManager
 
-__all__ = ("frozen_collection", "synchronized", "thread_lock")
+__all__ = ("synchronized",)
 
-_T = TypeVar("_T")
-thread_lock = RLock()
+__thread_lock = RLock()
 
 
-def synchronized(function: Callable[..., Any] = None, /):
-    def decorator(fn):
-        @wraps(fn)
-        def wrapper(*args, **kwargs):
-            with thread_lock:
-                return fn(*args, **kwargs)
-
-        return wrapper
-
-    return decorator(function) if function else decorator
-
-
-def frozen_collection(collection: Collection[_T]) -> Iterator[_T]:
-    with thread_lock:
-        t = tuple(collection)
-
-    yield from t
+@contextmanager
+def synchronized() -> ContextManager | ContextDecorator:
+    with __thread_lock:
+        yield

injection/core/module.py

@@ -39,11 +39,7 @@
 from injection.common.event import Event, EventChannel, EventListener
 from injection.common.lazy import Lazy, LazyMapping
 from injection.common.queue import LimitedQueue
-from injection.common.tools.threading import (
-    frozen_collection,
-    synchronized,
-    thread_lock,
-)
+from injection.common.tools.threading import synchronized
 from injection.common.tools.type import find_types, format_type, get_origins
 from injection.exceptions import (
     InjectionError,
@@ -193,7 +189,7 @@ def get_instance(self) -> _T:
         with suppress(KeyError):
             return self.cache[self.__INSTANCE_KEY]
 
-        with thread_lock:
+        with synchronized():
             instance = self.factory()
             self.cache[self.__INSTANCE_KEY] = instance
 
@@ -273,7 +269,7 @@ def __injectables(self) -> frozenset[Injectable]:
     def update(self, classes: Iterable[type], injectable: Injectable, override: bool):
         classes = frozenset(get_origins(*classes))
 
-        with thread_lock:
+        with synchronized():
             if not injectable:
                 classes -= self.__classes
                 override = True
@@ -289,7 +285,7 @@ def update(self, classes: Iterable[type], injectable: Injectable, override: bool
 
         return self
 
-    @synchronized
+    @synchronized()
     def unlock(self):
         for injectable in self.__injectables:
             injectable.unlock()
@@ -360,7 +356,7 @@ def is_locked(self) -> bool:
 
     @property
     def __brokers(self) -> Iterator[Broker]:
-        yield from frozen_collection(self.__modules)
+        yield from tuple(self.__modules)
         yield self.__container
 
     def injectable(
@@ -502,7 +498,7 @@ def change_priority(self, module: Module, priority: ModulePriority):
 
         return self
 
-    @synchronized
+    @synchronized()
     def unlock(self):
         for broker in self.__brokers:
             broker.unlock()
@@ -697,7 +693,7 @@ def bind(
         return Arguments(bound.args, bound.kwargs)
 
     def update(self, module: Module):
-        with thread_lock:
+        with synchronized():
             self.__dependencies = Dependencies.resolve(
                 self.signature,
                 module,
@@ -730,7 +726,5 @@ def __consume_setup_queue(self):
         return self
 
     def __set_signature(self, signature: Signature):
-        with thread_lock:
-            self.__signature__ = signature
-
+        self.__signature__ = signature
         return self