Fix race in ThreadSafeSingleton

This commit is contained in:
rda-dev 2020-11-10 18:53:52 +03:00
parent 4120afd1c3
commit f28abb2869
No known key found for this signature in database
GPG Key ID: 8900C7C5C15B294F

View File

@ -2178,15 +2178,19 @@ cdef class ThreadSafeSingleton(BaseSingleton):
:rtype: None :rtype: None
""" """
self.__storage = None with self.__storage_lock:
self.__storage = None
cpdef object _provide(self, tuple args, dict kwargs): cpdef object _provide(self, tuple args, dict kwargs):
"""Return single instance.""" """Return single instance."""
with self.__storage_lock: storage = self.__storage
if self.__storage is None: if storage is None:
self.__storage = __factory_call(self.__instantiator, with self.__storage_lock:
args, kwargs) if self.__storage is None:
return self.__storage self.__storage = __factory_call(self.__instantiator,
args, kwargs)
storage = self.__storage
return storage
cdef class DelegatedThreadSafeSingleton(ThreadSafeSingleton): cdef class DelegatedThreadSafeSingleton(ThreadSafeSingleton):