bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2025-06-24 11:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(device base): shut down task handler on destroy

Browse Source
This commit is contained in:
wakonig_k
2025-06-16 13:40:26 +02:00
parent 4ab8cad68c
commit 6527eb901d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ophyd_devices/interfaces/base_classes/psi_device_base.py
View File

@ -164,6 +164,7 @@ class PSIDeviceBase(Device):
"""Destroy the device.""" """Destroy the device."""
self.on_destroy() # Call the on_destroy method self.on_destroy() # Call the on_destroy method
self._stop_stoppable_status_objects() self._stop_stoppable_status_objects()
self.task_handler.shutdown()
return super().destroy() return super().destroy()
######################################## ########################################

4
ophyd_devices/utils/psi_device_base_utils.py
View File

@ -155,7 +155,7 @@ class TaskHandler:
task_status.set_finished() task_status.set_finished()
finally: finally:
with self._lock: with self._lock:
self._tasks.pop(task_status.task_id) self._tasks.pop(task_status.task_id, None)
def kill_task(self, task_status: TaskStatus) -> None: def kill_task(self, task_status: TaskStatus) -> None:
"""Kill the thread """Kill the thread
@ -171,7 +171,7 @@ class TaskHandler:
res = set_async_exc(ident, exc) res = set_async_exc(ident, exc)
if res == 0: if res == 0:
raise ValueError("Invalid thread ID") raise ValueError("Invalid thread ID")
elif res > 1: if res > 1:
set_async_exc(ident, None) set_async_exc(ident, None)
logger.warning(f"Exception raise while kille Thread {ident}; return value: {res}") logger.warning(f"Exception raise while kille Thread {ident}; return value: {res}")
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except