Improve application shutdown handling

Author: Agentry433

library/scheduler.py

@@ -42,6 +42,7 @@ def decorator(func):
         def async_func(*args, **kwargs):
             """ create an asynchronous function to wrap around our thread """
             func_hl = threading.Thread(target=func, name=threadname, args=args, kwargs=kwargs)
+            func_hl.daemon = True
             func_hl.start()
             return func_hl
 

library/smartmonitor_runtime.py

@@ -18,6 +18,7 @@
 _RUNTIME_READY = True
 _RUNTIME_DISABLED_REASON: str | None = None
 _DISK_IO_SAMPLE: tuple[float, float] | None = None
+_RUNTIME_THREADS: list[threading.Thread] = []
 _THEME_DEFAULT_TAGS: dict[str, dict[str, int]] = {
     "theme_science fiction.dat": {
         "CPU_PERCENT": 3,
@@ -585,6 +586,7 @@ def _metrics_worker():
 
 
 def start():
+    global _RUNTIME_THREADS
     if not _RUNTIME_READY:
         if _RUNTIME_DISABLED_REASON:
             logger.warning("SmartMonitor runtime workers are disabled: %s", _RUNTIME_DISABLED_REASON)
@@ -594,8 +596,22 @@ def start():
 
     logger.info("Starting SmartMonitor HID runtime mode")
 
-    time_thread = threading.Thread(target=_time_worker, name="SmartMonitor_Time", daemon=False)
-    metrics_thread = threading.Thread(target=_metrics_worker, name="SmartMonitor_Metrics", daemon=False)
+    time_thread = threading.Thread(target=_time_worker, name="SmartMonitor_Time", daemon=True)
+    metrics_thread = threading.Thread(target=_metrics_worker, name="SmartMonitor_Metrics", daemon=True)
     time_thread.start()
     metrics_thread.start()
-    return [time_thread, metrics_thread]
+    _RUNTIME_THREADS = [time_thread, metrics_thread]
+    return list(_RUNTIME_THREADS)
+
+
+def stop(timeout: float = 3.0):
+    import library.scheduler as scheduler
+
+    scheduler.STOPPING = True
+    deadline = time.monotonic() + max(0.0, timeout)
+    for thread in list(_RUNTIME_THREADS):
+        remaining = max(0.0, deadline - time.monotonic())
+        if remaining <= 0:
+            break
+        if thread.is_alive():
+            thread.join(remaining)

main.py

@@ -72,6 +72,7 @@
 MAIN_DIRECTORY = str(Path(__file__).parent.resolve()) + "/"
 
 if __name__ == "__main__":
+    _STOP_REQUESTED = False
 
     # Apply system locale to this program
     locale.setlocale(locale.LC_ALL, '')
@@ -91,6 +92,11 @@ def wait_for_empty_queue(timeout: int = 5):
         logger.debug("(Waited %.1fs)" % wait_time)
 
     def clean_stop(tray_icon=None):
+        global _STOP_REQUESTED
+        if _STOP_REQUESTED:
+            return
+        _STOP_REQUESTED = True
+
         # Turn screen and LEDs off before stopping
         if not smartmonitor_runtime.is_enabled():
             display.turn_off()
@@ -99,15 +105,25 @@ def clean_stop(tray_icon=None):
         # Instead, ask the scheduler to empty the action queue before stopping
         scheduler.STOPPING = True
 
-        if not smartmonitor_runtime.is_enabled():
+        if smartmonitor_runtime.is_enabled():
+            smartmonitor_runtime.stop(timeout=3.0)
+            try:
+                display.lcd.closeSerial()
+            except Exception:
+                pass
+        else:
             # Waiting for all pending request to be sent to display
             wait_for_empty_queue(5)
-        else:
-            display.lcd.closeSerial()
 
         # Remove tray icon just before exit
         if tray_icon:
-            tray_icon.visible = False
+            try:
+                tray_icon.stop()
+            except Exception:
+                try:
+                    tray_icon.visible = False
+                except Exception:
+                    pass
 
         # We force the exit to avoid waiting for other scheduled tasks: they may have a long delay!
         try: