correct processpool handling and remove unneeded check_canceled calls

Author: d-biehl

robotcode/language_server/common/parts/workspace.py

@@ -441,7 +441,8 @@ def remove() -> None:
     @_logger.call
     async def remove_file_watcher_entry(self, entry: FileWatcherEntry) -> None:
         async with self._file_watchers_lock:
-            self._file_watchers.remove(entry)
+            if entry in self._file_watchers:
+                self._file_watchers.remove(entry)
 
             if entry.parent is not None:
                 entry.parent.child_callbacks.remove(entry.callback)  # type: ignore

robotcode/language_server/common/protocol.py

@@ -206,13 +206,16 @@ async def on_initialized(sender) -> None:  # pragma: no cover, NOSONAR
 
     @rpc_method(name="shutdown", cancelable=False)
     @_logger.call
-    async def shutdown(self, *args: Any, **kwargs: Any) -> None:
+    async def _shutdown(self, *args: Any, **kwargs: Any) -> None:
+        if self.shutdown_received:
+            return
+
         self.shutdown_received = True
 
         try:
             await asyncio.wait_for(self.cancel_all_received_request(), 1)
-        except BaseException:  # NOSONAR
-            pass
+        except BaseException as e:  # NOSONAR
+            self._logger.exception(e)
 
         await self.on_shutdown(self)
 

robotcode/language_server/common/text_document.py

@@ -6,7 +6,7 @@
 from types import MethodType
 from typing import Any, Awaitable, Callable, Dict, List, Optional, TypeVar, Union, cast
 
-from ...utils.async_tools import Lock, check_canceled, create_sub_task
+from ...utils.async_tools import Lock, create_sub_task
 from ...utils.logging import LoggingDescriptor
 from ...utils.uri import Uri
 from .lsp_types import DocumentUri, Range
@@ -191,7 +191,6 @@ async def get_cache(
 
         if e is None:
             async with self._lock:
-                await check_canceled()
                 e = self._cache.get(reference, None)
                 if e is None:
 
@@ -201,7 +200,6 @@ async def get_cache(
 
         if e.data is None:
             async with e.lock:
-                await check_canceled()
                 if e.data is None:
                     e.data = await entry(self, *args, **kwargs)  # type: ignore
 

robotcode/language_server/robotframework/diagnostics/analyzer.py

@@ -4,7 +4,7 @@
 import asyncio
 from typing import List, Optional, cast
 
-from ....utils.async_tools import CancelationToken, check_canceled
+from ....utils.async_tools import CancelationToken
 from ....utils.uri import Uri
 from ...common.lsp_types import (
     Diagnostic,
@@ -40,8 +40,6 @@ async def get(
         return self._results
 
     async def visit(self, node: ast.AST) -> None:
-        await check_canceled()
-
         await super().visit(node)
 
     async def _analyze_keyword_call(

robotcode/language_server/robotframework/diagnostics/imports_manager.py

@@ -449,8 +449,6 @@ async def get_libdoc(self) -> VariablesDoc:
 class ImportsManager:
     _logger = LoggingDescriptor()
 
-    process_pool = get_process_pool()
-
     def __init__(
         self, parent_protocol: RobotLanguageServerProtocol, folder: Uri, config: Optional[RobotConfig]
     ) -> None:
@@ -468,6 +466,8 @@ def __init__(
         self.parent_protocol.documents.did_change.add(self.resource_document_changed)
         self._command_line_variables: Optional[List[VariableDefinition]] = None
 
+        self.process_pool = get_process_pool()
+
     @_logger.call
     def get_command_line_variables(self) -> List[VariableDefinition]:
         if self._command_line_variables is None:

robotcode/language_server/robotframework/diagnostics/namespace.py

@@ -23,7 +23,7 @@
 )
 
 from ....utils.async_itertools import async_chain
-from ....utils.async_tools import CancelationToken, Lock, check_canceled
+from ....utils.async_tools import CancelationToken, Lock
 from ....utils.logging import LoggingDescriptor
 from ....utils.uri import Uri
 from ...common.lsp_types import (
@@ -1105,8 +1105,6 @@ async def _analyze(self, cancelation_token: Optional[CancelationToken] = None) -
                     try:
                         result = await Analyzer().get(self.model, self, cancelation_token)
 
-                        await check_canceled()
-
                         self._diagnostics += result
 
                         lib_doc = await self.get_library_doc()

robotcode/language_server/robotframework/parts/diagnostics.py

@@ -145,8 +145,6 @@ async def collect_walk_model_errors(
 
         result: List[Diagnostic] = []
         async for node in iter_nodes(model):
-            await check_canceled()
-
             error = node.error if isinstance(node, HasError) else None
             if error is not None:
                 result.append(self._create_error_from_node(node, error))

robotcode/language_server/robotframework/parts/robocop_diagnostics.py

@@ -80,7 +80,7 @@ async def collect(
 
         await check_canceled()
 
-        with io.StringIO("") as output:
+        with io.StringIO() as output:
             config = Config(str(workspace_folder.uri.to_path()))
 
             config.exec_dir = str(workspace_folder.uri.to_path())

robotcode/language_server/robotframework/utils/process_pool.py

@@ -32,7 +32,6 @@ def get_process_pool() -> ProcessPoolExecutor:
     if _process_pool is None:
         _process_pool = ProcessPoolExecutor(max_workers=PROCESS_POOL_MAX_WORKERS, initializer=_init_pool)
         atexit.register(_terminate)
-        signal.signal(signal.SIGTERM, _terminate)
 
         try:
             _process_pool.submit(_dummy_first_run_pool).result(5)