[sdk-1710] convert some existing lock implementation to RWlock if they benefit

Author: jsonbailey

ldclient/impl/datasystem/store.py

@@ -6,7 +6,6 @@
 ChangeSet applications and flag change notifications.
 """
 
-import threading
 from collections import defaultdict
 from typing import Any, Callable, Dict, List, Optional, Set
 
@@ -194,7 +193,7 @@ def __init__(
         self._selector = Selector.no_selector()
 
         # Thread synchronization
-        self._lock = threading.RLock()
+        self._lock = ReadWriteLock()
 
     def with_persistence(
         self,
@@ -213,7 +212,7 @@ def with_persistence(
         Returns:
             Self for method chaining
         """
-        with self._lock:
+        with self._lock.write_lock():
             self._persistent_store = persistent_store
             self._persistent_store_writable = writable
             self._persistent_store_status_provider = status_provider
@@ -225,12 +224,12 @@ def with_persistence(
 
     def selector(self) -> Selector:
         """Returns the current selector."""
-        with self._lock:
+        with self._lock.read_lock():
             return self._selector
 
     def close(self) -> Optional[Exception]:
         """Close the store and any persistent store if configured."""
-        with self._lock:
+        with self._lock.write_lock():
             if self._persistent_store is not None:
                 try:
                     # Most FeatureStore implementations don't have close methods
@@ -251,7 +250,7 @@ def apply(self, change_set: ChangeSet, persist: bool) -> None:
         """
         collections = self._changes_to_store_data(change_set.changes)
 
-        with self._lock:
+        with self._lock.write_lock():
             try:
                 if change_set.intent_code == IntentCode.TRANSFER_FULL:
                     self._set_basis(collections, change_set.selector, persist)
@@ -443,7 +442,7 @@ def __mapping(data: Dict[str, ModelEntity]) -> Dict[str, Dict[str, Any]]:
 
             return __mapping
 
-        with self._lock:
+        with self._lock.write_lock():
             if self._should_persist():
                 try:
                     # Get all data from memory store and write to persistent store
@@ -457,7 +456,7 @@ def __mapping(data: Dict[str, ModelEntity]) -> Dict[str, Dict[str, Any]]:
 
     def get_active_store(self) -> ReadOnlyStore:
         """Get the currently active store for reading data."""
-        with self._lock:
+        with self._lock.read_lock():
             return self._active_store
 
     def is_initialized(self) -> bool:
@@ -466,5 +465,5 @@ def is_initialized(self) -> bool:
 
     def get_data_store_status_provider(self) -> Optional[DataStoreStatusProvider]:
         """Get the data store status provider for the persistent store, if configured."""
-        with self._lock:
+        with self._lock.read_lock():
             return self._persistent_store_status_provider

ldclient/impl/listeners.py

@@ -1,6 +1,6 @@
-from threading import RLock
 from typing import Any, Callable
 
+from ldclient.impl.rwlock import ReadWriteLock
 from ldclient.impl.util import log
 
 
@@ -12,25 +12,25 @@ class Listeners:
 
     def __init__(self):
         self.__listeners = []
-        self.__lock = RLock()
+        self.__lock = ReadWriteLock()
 
     def has_listeners(self) -> bool:
-        with self.__lock:
+        with self.__lock.read_lock():
             return len(self.__listeners) > 0
 
     def add(self, listener: Callable):
-        with self.__lock:
+        with self.__lock.write_lock():
             self.__listeners.append(listener)
 
     def remove(self, listener: Callable):
-        with self.__lock:
+        with self.__lock.write_lock():
             try:
                 self.__listeners.remove(listener)
             except ValueError:
                 pass  # removing a listener that wasn't in the list is a no-op
 
     def notify(self, value: Any):
-        with self.__lock:
+        with self.__lock.read_lock():
             listeners_copy = self.__listeners.copy()
         for listener in listeners_copy:
             try: