@furongjun1999/dsh-memory 0.5.0 → 0.6.0

package/md_cg/units.py

@@ -126,10 +126,11 @@ def _tasklist_row(pid):
     try:
         # 显式 utf-8 + replace：只消费 ASCII 的 pid 列，但**不依赖 locale**——
         # locale 口径与「后代写 UTF-8」不一致时读线程会崩（见 test_subproc_encoding.py）。
+        # P2-16（批次 30）：timeout=10——tasklist 挂起曾永久阻塞判活路径。
         r = subprocess.run(["tasklist", "/FI", f"PID eq {pid}", "/NH", "/FO", "CSV"],
                            capture_output=True, text=True,
-                           encoding="utf-8", errors="replace")
-    except OSError:
+                           encoding="utf-8", errors="replace", timeout=10)
+    except (OSError, subprocess.SubprocessError):
         return None
     for line in (r.stdout or "").splitlines():
         cols = line.split('","')

package/md_cg/vision_evidence.py

@@ -65,6 +65,7 @@ import time
 from . import crypto, evolution
 from .fsutil import append_jsonl, read_jsonl
 from .mdcos import MdCGOS
+from .readcache import direct_read
 
 # ---- 常量 -----------------------------------------------------------------
 
@@ -293,7 +294,7 @@ def _vision_nodes(cg, layer=None, prefixes=VISION_PREFIXES, limit=None) -> list:
         nid = e.get("id") or os.path.basename(e.get("path") or "")[:-3]
         if not any(nid.startswith(p) for p in prefixes):
             continue
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 收集读喂写面（plan→apply）：走盘上真值
         if fm is None:
             continue
         if crypto.is_encrypted(content):
@@ -492,7 +493,7 @@ def apply(x, ids=None, entry_ids=None, layer=None, prefixes=None,
         if not e:
             rep["skipped_drift"] += 1
             continue
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 写前重查走盘上真值（读缓存口径）
         if fm is None or crypto.is_encrypted(content):
             rep["skipped_locked"] += 1
             continue
@@ -576,7 +577,7 @@ def rollback(x, batch=None, entry_ids=None, actor=None) -> dict:
         if not e:
             rep["missing"] += 1
             continue
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 回滚比对走盘上真值（读缓存口径）
         if fm is None:
             rep["missing"] += 1
             continue