修改calman灰阶点击异常、修改色准结果显示异常

app/services/ucd_service.py

@@ -12,7 +12,9 @@
 
 from __future__ import annotations
 
+from contextlib import contextmanager
 import logging
+import sys
 import threading
 
 from app.ucd_domain import (
@@ -34,6 +36,10 @@ from drivers.ucd_driver import IUcdDevice
 
 log = logging.getLogger(__name__)
 
+_LOCK_TIMEOUT_SECONDS = 8.0
+_DEBUG_LOCK_TIMEOUT_SECONDS = 0.3
+_PATTERN_LOCK_TIMEOUT_SECONDS = 0.8
+
 
 # ─── 视图字符串 → 值对象 转换工具 ────────────────────────────────
 
@@ -85,6 +91,53 @@ class SignalService:
         self._dev = device
         self._bus = bus
         self._lock = threading.RLock()
+        self._lock_owner_tid: int | None = None
+        self._lock_owner_name: str | None = None
+
+    def _effective_lock_timeout(self, timeout_override: float | None = None) -> float:
+        """调试模式下缩短锁等待，避免单步时表现为 UI 长时间无响应。"""
+        if timeout_override is not None:
+            return timeout_override
+        if sys.gettrace() is not None:
+            return _DEBUG_LOCK_TIMEOUT_SECONDS
+        return _LOCK_TIMEOUT_SECONDS
+
+    @contextmanager
+    def _acquire_service_lock(self, op_name: str, timeout_override: float | None = None):
+        timeout = self._effective_lock_timeout(timeout_override)
+        current = threading.current_thread()
+        log.info(
+            "SignalService.%s acquiring lock timeout=%.1fs tid=%s thread=%s owner_tid=%s owner_thread=%s",
+            op_name,
+            timeout,
+            threading.get_ident(),
+            current.name,
+            self._lock_owner_tid,
+            self._lock_owner_name,
+        )
+        acquired = self._lock.acquire(timeout=timeout)
+        if not acquired:
+            raise UcdError(
+                "UCD busy: lock timeout in "
+                f"SignalService.{op_name} ({timeout:.1f}s), "
+                f"owner_tid={self._lock_owner_tid}, owner_thread={self._lock_owner_name}"
+            )
+        prev_owner_tid = self._lock_owner_tid
+        prev_owner_name = self._lock_owner_name
+        self._lock_owner_tid = threading.get_ident()
+        self._lock_owner_name = current.name
+        log.info(
+            "SignalService.%s lock acquired tid=%s thread=%s",
+            op_name,
+            self._lock_owner_tid,
+            self._lock_owner_name,
+        )
+        try:
+            yield
+        finally:
+            self._lock_owner_tid = prev_owner_tid
+            self._lock_owner_name = prev_owner_name
+            self._lock.release()
 
     # -- 高层接口 ------------------------------------------------
 
@@ -100,7 +153,7 @@ class SignalService:
         Returns:
             ``format_changed``——本次相对上一次 :meth:`apply` 是否变化。
         """
-        with self._lock:
+        with self._acquire_service_lock("apply"):
             log.info(
                 "SignalService.apply signal=%s timing=%s pattern=%s",
                 signal,
@@ -114,7 +167,7 @@ class SignalService:
 
     def send_pattern(self, pattern: PatternSpec) -> None:
         """在已 configure 的信号上仅更新图案后 apply。"""
-        with self._lock:
+        with self._acquire_service_lock("send_pattern", _PATTERN_LOCK_TIMEOUT_SECONDS):
             log.info("SignalService.send_pattern pattern=%s", pattern.kind.value)
             self._dev.set_pattern(pattern)
             self._dev.apply()
@@ -155,7 +208,7 @@ class SignalService:
         ctrl = getattr(self._dev, "raw_controller", None)
         if ctrl is None:
             raise UcdError("update_signal_format 暂仅支持 UCD323Device")
-        with self._lock:
+        with self._acquire_service_lock("update_signal_format"):
             return bool(
                 ctrl.apply_signal_format(
                     color_space=color_space,
@@ -193,7 +246,7 @@ class SignalService:
         ctrl = getattr(self._dev, "raw_controller", None)
         if ctrl is None:
             raise UcdError("apply_config 暂仅支持 UCD323Device")
-        with self._lock:
+        with self._acquire_service_lock("apply_config"):
             return bool(ctrl.set_ucd_params(config))
 
     def send_pattern_params(self, params) -> bool:
@@ -201,7 +254,7 @@ class SignalService:
         ctrl = getattr(self._dev, "raw_controller", None)
         if ctrl is None:
             raise UcdError("send_pattern_params 暂仅支持 UCD323Device")
-        with self._lock:
+        with self._acquire_service_lock("send_pattern_params"):
             return bool(ctrl.send_current_pattern_params(params))
 
     def apply_and_run(self, config, pattern_params) -> bool:
@@ -212,7 +265,7 @@ class SignalService:
         ctrl = getattr(self._dev, "raw_controller", None)
         if ctrl is None:
             raise UcdError("apply_and_run 暂仅支持 UCD323Device")
-        with self._lock:
+        with self._acquire_service_lock("apply_and_run"):
             if not ctrl.set_ucd_params(config):
                 return False
             if not ctrl.set_pattern(ctrl.current_pattern, pattern_params):