性能优化

Module/FlaskSubprocessManager.py

@@ -9,6 +9,8 @@ import time
 from pathlib import Path
 from typing import Optional, Union, Dict, List
 
+import psutil
+
 from Utils.LogManager import LogManager
 
 
@@ -28,9 +30,39 @@ class FlaskSubprocessManager:
         self.comm_port = 34566
         self._stop_event = threading.Event()
         self._monitor_thread: Optional[threading.Thread] = None
+        # 新增：启动前先把可能残留的 Flask 干掉
+        self._kill_orphan_flask()
         atexit.register(self.stop)
         LogManager.info("FlaskSubprocessManager 单例已初始化", udid="system")
 
+    def _kill_orphan_flask(self):
+        """根据端口 34566 把遗留进程全部杀掉"""
+        try:
+            if os.name == "nt":
+                # Windows
+                out = subprocess.check_output(
+                    ["netstat", "-ano"],
+                    text=True, startupinfo=self._si
+                )
+                for line in out.splitlines():
+                    if f"127.0.0.1:{self.comm_port}" in line and "LISTENING" in line:
+                        pid = int(line.strip().split()[-1])
+                        if pid != os.getpid():
+                            subprocess.run(["taskkill", "/F", "/PID", str(pid)],
+                                           startupinfo=self._si,
+                                           capture_output=True)
+            else:
+                # macOS / Linux
+                out = subprocess.check_output(
+                    ["lsof", "-t", f"-iTCP:{self.comm_port}", "-sTCP:LISTEN"],
+                    text=True
+                )
+                for pid in map(int, out.split()):
+                    if pid != os.getpid():
+                        os.kill(pid, 9)
+        except Exception:
+            pass
+
     # ---------- 启动 ----------
     def start(self):
         with self._lock:
@@ -108,27 +140,24 @@ class FlaskSubprocessManager:
     # ---------- 停止 ----------
     def stop(self):
         with self._lock:
-            if getattr(self, 'process', None) is None:
-                LogManager.info("无子进程需要停止", udid="system")
+            if not self.process:
                 return
-
             pid = self.process.pid
             LogManager.info(f"正在停止 Flask 子进程 PID={pid}", udid="system")
             try:
-                self.process.terminate()
-                try:
-                    self.process.wait(timeout=3)
-                except subprocess.TimeoutExpired:
-                    LogManager.warning("软杀超时，强制杀进程树", udid="system")
-                    import psutil
-                    parent = psutil.Process(pid)
-                    for child in parent.children(recursive=True):
-                        child.kill()
-                    parent.kill()
-                    self.process.wait()
-                LogManager.info("Flask 子进程已停止", udid="system")
+                # 1. 杀整棵树（Windows 也适用）
+                parent = psutil.Process(pid)
+                for child in parent.children(recursive=True):
+                    child.kill()
+                parent.kill()
+                gone, alive = psutil.wait_procs([parent] + parent.children(), timeout=3)
+                for p in alive:
+                    p.kill()  # 保险再补一刀
+                self.process.wait()
+            except psutil.NoSuchProcess:
+                pass
             except Exception as e:
-                LogManager.error(f"停止子进程时异常：{e}", udid="system")
+                LogManager.error(f"停止子进程异常：{e}", udid="system")
             finally:
                 self.process = None
                 self._stop_event.set()