replace locks in async_cache and text_document with threading.RLocks

Author: d-biehl

robotcode/language_server/common/text_document.py

@@ -7,7 +7,7 @@
 import weakref
 from typing import Any, Awaitable, Callable, Dict, List, Optional, TypeVar, Union, cast
 
-from ...utils.async_tools import Lock, async_event, create_sub_task
+from ...utils.async_tools import async_event, create_sub_task
 from ...utils.logging import LoggingDescriptor
 from ...utils.uri import Uri
 from .lsp_types import DocumentUri, Range
@@ -24,7 +24,7 @@ class CacheEntry:
     def __init__(self) -> None:
         self.data: Any = None
         self.has_data: bool = False
-        self.lock: Lock = Lock()
+        self.lock = threading.RLock()
 
 
 class TextDocument:
@@ -216,16 +216,14 @@ async def get_cache(
 
         reference = self.__get_cache_reference(entry)
 
-        # with self._lock:
         e = self._cache[reference]
 
-        if not e.has_data:
-            async with e.lock:
-                if not e.has_data:
-                    e.data = await entry(self, *args, **kwargs)
-                    e.has_data = True
+        with e.lock:
+            if not e.has_data:
+                e.data = await entry(self, *args, **kwargs)
+                e.has_data = True
 
-        return cast(_T, e.data)
+            return cast(_T, e.data)
 
     @_logger.call
     async def remove_cache_entry(

robotcode/utils/async_cache.py

@@ -1,8 +1,7 @@
+import threading
 from collections import defaultdict
 from typing import Any, Awaitable, Callable, Dict, List, Optional, Tuple, TypeVar, cast
 
-from .async_tools import Lock
-
 _T = TypeVar("_T")
 
 
@@ -16,7 +15,7 @@ class CacheEntry:
     def __init__(self) -> None:
         self.data: Any = None
         self.has_data: bool = False
-        self.lock: Lock = Lock()
+        self.lock = threading.RLock()
 
 
 class AsyncSimpleLRUCache:
@@ -27,7 +26,7 @@ def __init__(self, max_items: Optional[int] = 128) -> None:
         self._order: Optional[List[Tuple[Any, ...]]] = None
         if self.max_items:
             self._order = []
-        self._lock: Lock = Lock()
+        self._lock = threading.RLock()
 
     async def has(self, *args: Any, **kwargs: Any) -> bool:
         key = self._make_key(*args, **kwargs)
@@ -42,27 +41,26 @@ async def get(self, func: Callable[..., Awaitable[_T]], *args: Any, **kwargs: An
 
         entry = self._cache[key]
 
-        if not entry.has_data:
-            async with entry.lock:
-                if not entry.has_data:
-                    entry.data = await func(*args, **kwargs)
-                    entry.has_data = True
+        with entry.lock:
+            if not entry.has_data:
+                entry.data = await func(*args, **kwargs)
+                entry.has_data = True
 
-                    if self._order is not None and self.max_items is not None:
-                        async with self._lock:
-                            self._order.insert(0, key)
+                if self._order is not None and self.max_items is not None:
+                    with self._lock:
+                        self._order.insert(0, key)
 
-                            if len(self._order) > self.max_items:
-                                del self._cache[self._order.pop()]
+                        if len(self._order) > self.max_items:
+                            del self._cache[self._order.pop()]
 
-        return cast(_T, entry.data)
+            return cast(_T, entry.data)
 
     @staticmethod
     def _make_key(*args: Any, **kwargs: Any) -> Tuple[Any, ...]:
         return (tuple(_freeze(v) for v in args), hash(frozenset({k: _freeze(v) for k, v in kwargs.items()})))
 
     async def clear(self) -> None:
-        async with self._lock:
+        with self._lock:
             self._cache.clear()
             if self._order is not None:
                 self._order.clear()

tests/robotcode/language_server/robotframework/parts/data/.vscode/settings.json

@@ -31,5 +31,6 @@
     // "robotcode.debug.outputMessages": true
     //"python.analysis.diagnosticMode": "workspace"
     //"robotcode.robot.paths": ["./tests", "./tests1"]
-    "robotcode.analysis.diagnosticMode": "workspace"
+    "robotcode.analysis.diagnosticMode": "workspace",
+    "robotcode.analysis.progressMode": "detailed"
 }