Refactor storage locking of ThreadSafeSingleton

docs/main/changelog.rst

@@ -9,7 +9,8 @@ follows `Semantic versioning`_
 
 Development version
 -------------------
-- No features.
+.. - No features.
+- Refactor storage locking of ``ThreadSafeSingleton`` provider.
 
 3.4.1
 -----

src/dependency_injector/containers.c

@@ -876,12 +876,12 @@ struct __pyx_obj_19dependency_injector_9providers_DelegatedSingleton {
  * 
  * cdef class ThreadSafeSingleton(BaseSingleton):             # <<<<<<<<<<<<<<
  *     cdef object __storage
- *     cdef object __lock
+ *     cdef object __storage_lock
  */
 struct __pyx_obj_19dependency_injector_9providers_ThreadSafeSingleton {
   struct __pyx_obj_19dependency_injector_9providers_BaseSingleton __pyx_base;
   PyObject *__pyx___storage;
-  PyObject *__pyx___lock;
+  PyObject *__pyx___storage_lock;
 };
 
 
@@ -1259,7 +1259,7 @@ static struct __pyx_vtabstruct_19dependency_injector_9providers_DelegatedSinglet
  * 
  * cdef class ThreadSafeSingleton(BaseSingleton):             # <<<<<<<<<<<<<<
  *     cdef object __storage
- *     cdef object __lock
+ *     cdef object __storage_lock
  */
 
 struct __pyx_vtabstruct_19dependency_injector_9providers_ThreadSafeSingleton {

src/dependency_injector/providers.pxd

@@ -101,7 +101,7 @@ cdef class DelegatedSingleton(Singleton):
 
 cdef class ThreadSafeSingleton(BaseSingleton):
     cdef object __storage
-    cdef object __lock
+    cdef object __storage_lock
 
     cpdef object _provide(self, tuple args, dict kwargs)
 

src/dependency_injector/providers.pyx

@@ -24,12 +24,6 @@ else:  # pragma: no cover
                                     copy.deepcopy(obj.im_self, memo),
                                     obj.im_class)
 
-GLOBAL_LOCK = threading.RLock()
-"""Global reentrant lock.
-
-:type: :py:class:`threading.RLock`
-"""
-
 
 cdef class Provider(object):
     """Base provider class.
@@ -1307,6 +1301,12 @@ cdef class DelegatedSingleton(Singleton):
 cdef class ThreadSafeSingleton(BaseSingleton):
     """Thread-safe singleton provider."""
 
+    storage_lock = threading.RLock()
+    """Storage reentrant lock.
+
+    :type: :py:class:`threading.RLock`
+    """
+
     def __init__(self, provides, *args, **kwargs):
         """Initializer.
 
@@ -1320,7 +1320,7 @@ cdef class ThreadSafeSingleton(BaseSingleton):
         :type kwargs: dict[str, object]
         """
         self.__storage = None
-        self.__lock = GLOBAL_LOCK
+        self.__storage_lock = self.__class__.storage_lock
         super(ThreadSafeSingleton, self).__init__(provides, *args, **kwargs)
 
     def reset(self):
@@ -1332,7 +1332,7 @@ cdef class ThreadSafeSingleton(BaseSingleton):
 
     cpdef object _provide(self, tuple args, dict kwargs):
         """Return single instance."""
-        with self.__lock:
+        with self.__storage_lock:
             if self.__storage is None:
                 self.__storage = __factory_call(self.__instantiator,
                                                 args, kwargs)