Handle Thread.join correctly when it is not joinable

OpenCyphal · Jan 18, 2024 · 7b38e49 · 7b38e49
1 parent c0e9c20
commit 7b38e49
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/pycyphal/transport/can/media/candump/_candump.py b/pycyphal/transport/can/media/candump/_candump.py
@@ -146,7 +146,10 @@ def close(self) -> None:
             self._f.close()
             self._thread, thd = None, self._thread
             assert thd is not None
-            thd.join(timeout=1)
+            try:
+                thd.join(timeout=1)
+            except RuntimeError:
+                pass
 
     @property
     def _is_closed(self) -> bool:

diff --git a/pycyphal/transport/can/media/pythoncan/_pythoncan.py b/pycyphal/transport/can/media/pythoncan/_pythoncan.py
@@ -323,9 +323,15 @@ def close(self) -> None:
         self._closed = True
         try:
             self._tx_queue.put(None)
-            self._tx_thread.join(timeout=self._MAXIMAL_TIMEOUT_SEC * 10)
+            try:
+                self._tx_thread.join(timeout=self._MAXIMAL_TIMEOUT_SEC * 10)
+            except RuntimeError:
+                pass
             if self._maybe_thread is not None:
-                self._maybe_thread.join(timeout=self._MAXIMAL_TIMEOUT_SEC * 10)
+                try:
+                    self._maybe_thread.join(timeout=self._MAXIMAL_TIMEOUT_SEC * 10)
+                except RuntimeError:
+                    pass
                 self._maybe_thread = None
         finally:
             try:

diff --git a/pycyphal/transport/can/media/socketcan/_socketcan.py b/pycyphal/transport/can/media/socketcan/_socketcan.py
@@ -165,7 +165,10 @@ def close(self) -> None:
             if self._ctl_main.fileno() >= 0:  # Ignore if already closed.
                 self._ctl_main.send(b"stop")  # The actual data is irrelevant, we just need it to unblock the select().
             if self._maybe_thread:
-                self._maybe_thread.join(timeout=_SELECT_TIMEOUT)
+                try:
+                    self._maybe_thread.join(timeout=_SELECT_TIMEOUT)
+                except RuntimeError:
+                    pass
                 self._maybe_thread = None
         finally:
             self._sock.close()  # These are expected to be idempotent.

diff --git a/pycyphal/transport/can/media/socketcand/_socketcand.py b/pycyphal/transport/can/media/socketcand/_socketcand.py
@@ -203,9 +203,15 @@ def close(self) -> None:
         self._closed = True
         try:
             self._tx_queue.put(None)
-            self._tx_thread.join(timeout=self._MAXIMAL_TIMEOUT_SEC * 10)
+            try:
+                self._tx_thread.join(timeout=self._MAXIMAL_TIMEOUT_SEC * 10)
+            except RuntimeError:
+                pass
             if self._maybe_thread is not None:
-                self._maybe_thread.join(timeout=self._MAXIMAL_TIMEOUT_SEC * 10)
+                try:
+                    self._maybe_thread.join(timeout=self._MAXIMAL_TIMEOUT_SEC * 10)
+                except RuntimeError:
+                    pass
                 self._maybe_thread = None
         finally:
             try: