check if thread is alive before closing

pyiron · Dec 24, 2024 · bf8c80e · bf8c80e
1 parent fcb6c06
commit bf8c80e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/executorlib/base/executor.py b/executorlib/base/executor.py
@@ -126,7 +126,7 @@ def shutdown(self, wait: bool = True, *, cancel_futures: bool = False):
         """
         if cancel_futures:
             cancel_items_in_queue(que=self._future_queue)
-        if self._process is not None:
+        if self._process is not None and self._process.is_alive():
             self._future_queue.put({"shutdown": True, "wait": wait})
             if wait:
                 self._process.join()

diff --git a/executorlib/interactive/shared.py b/executorlib/interactive/shared.py
@@ -71,11 +71,12 @@ def shutdown(self, wait: bool = True, *, cancel_futures: bool = False):
         if cancel_futures:
             cancel_items_in_queue(que=self._future_queue)
         if self._process is not None:
-            for _ in range(len(self._process)):
-                self._future_queue.put({"shutdown": True, "wait": wait})
+            for process in self._process:
+                if process.is_alive():
+                    self._future_queue.put({"shutdown": True, "wait": wait})
+                    if wait:
+                        process.join()
             if wait:
-                for process in self._process:
-                    process.join()
                 self._future_queue.join()
         self._process = None
         self._future_queue = None