Zombie thread fix

tomcat_bec/device_configs/microxas_test_bed.yaml

@@ -119,25 +119,25 @@ femto_mean_curr:
 #  readoutPriority: monitored
 #  softwareTrigger: true
 
-gfcam:
+# gfcam:
-  description: GigaFrost camera client
+#   description: GigaFrost camera client
-  deviceClass: tomcat_bec.devices.GigaFrostCamera
+#   deviceClass: tomcat_bec.devices.GigaFrostCamera
-  deviceConfig:
+#   deviceConfig:
-    prefix: 'X02DA-CAM-GF2:'
+#     prefix: 'X02DA-CAM-GF2:'
-    backend_url: 'http://sls-daq-001:8080'
+#     backend_url: 'http://sls-daq-001:8080'
-    auto_soft_enable: true
+#     auto_soft_enable: true
-    std_daq_live: 'tcp://129.129.95.111:20000'
+#     std_daq_live: 'tcp://129.129.95.111:20000'
-    std_daq_ws: 'ws://129.129.95.111:8080'
+#     std_daq_ws: 'ws://129.129.95.111:8080'
-    std_daq_rest: 'http://129.129.95.111:5000'
+#     std_daq_rest: 'http://129.129.95.111:5000'
-  deviceTags:
+#   deviceTags:
-  - camera
+#   - camera
-  - trigger
+#   - trigger
-  - gfcam
+#   - gfcam
-  enabled: true
+#   enabled: true
-  onFailure: buffer
+#   onFailure: buffer
-  readOnly: false
+#   readOnly: false
-  readoutPriority: monitored
+#   readoutPriority: monitored
-  softwareTrigger: true
+#   softwareTrigger: true
 
 # gfdaq:
 #   description: GigaFrost stdDAQ client

tomcat_bec/devices/gigafrost/pcoedgecamera.py

@@ -200,6 +200,7 @@ class PcoEdge5M(PSIDeviceBase, PcoEdgeBase):
         self.file_savestop.set(0).wait()
 
     def destroy(self):
+        logger.warning("Destroy called")
         if self.backend is not None:
             self.backend.shutdown()
         super().destroy()

tomcat_bec/devices/gigafrost/std_daq_client.py

@@ -54,7 +54,7 @@ class StdDaqClient:
     _status: StdDaqStatus = StdDaqStatus.UNDEFINED
     _status_timestamp: float | None = None
     _ws_recv_mutex = threading.Lock()
-    _ws_update_thread: threading.Thread | None = None
+    _ws_monitor_thread: threading.Thread | None = None
     _shutdown_event = threading.Event()
     _ws_idle_event = threading.Event()
     _daq_is_running = threading.Event()
@@ -272,11 +272,16 @@ class StdDaqClient:
         """
         Shutdown the StdDAQ client.
         """
-        if self._ws_update_thread is not None:
+        logger.warning("Shutting down sdtDAQ monitor")
-            self._ws_update_thread.join()
+        self._shutdown_event.set()
+        if self._ws_monitor_thread is not None:
+            self._ws_monitor_thread.join()
+        logger.warning("Shutdown joined")
         if self._ws_client is not None:
             self._ws_client.close()
         self._ws_client = None
+        logger.warning("Shutdown complete")
+
 
     def _wait_for_server_running(self):
         """
@@ -296,10 +301,12 @@ class StdDaqClient:
         callbacks. It also handles stdDAQ restarts and reconnection by itself.
         """
         if self._ws_recv_mutex.locked():
+            logger.warning("stdDAQ WS monitor loop already locked")
             return
 
         with self._ws_recv_mutex:
             while not self._shutdown_event.is_set():
+                logger.warning("NI")
                 self._wait_for_server_running()
                 try:
                     msg = self._ws_client.recv(timeout=0.1)