combine the run_command instrument to one file

Author: joyguoguo

fuzz/build_fuzz.py

@@ -34,6 +34,8 @@
 from returns.maybe import Maybe
 from multiprocessing import Pool
 from errors import BuildError, CommandError, PathError, ConfigError
+from command_util import run_command_build_fuzz as run_command
+
 
 
 # ========================================================================================

fuzz/command_util.py

@@ -6,37 +6,109 @@
 from errors import CommandError
 from pathlib import Path
 
-def run_command(
+import subprocess
+import time
+import logging
+from pathlib import Path
+from returns.maybe import Maybe
+from errors import CommandError
+
+def _run_subprocess(
+    cmd: str,
+    cwd: Path = None,
+    capture_output: bool = False,
+    timeout: int = None,
+    logger: logging.Logger = None,
+) -> tuple[int, list[str]]:
+    """
+    低层执行子进程命令
+    - capture_output=True：捕获 stdout，返回输出列表
+    - timeout 秒超时（无超时则None）
+    - logger 用于实时打印输出
+    返回：(退出码, 输出行列表)
+    """
+    process = subprocess.Popen(
+        cmd,
+        shell=True,
+        cwd=str(cwd) if cwd else None,
+        stdout=subprocess.PIPE if capture_output else None,
+        stderr=subprocess.STDOUT if capture_output else None,
+        text=True,
+        encoding="utf-8",
+        errors="replace",
+    )
+
+    output_lines = []
+    start_time = time.time()
+
+    try:
+        if capture_output:
+            while True:
+                line = process.stdout.readline()
+                if line:
+                    output_lines.append(line.rstrip())
+                    if logger:
+                        logger.debug(line.rstrip())
+                elif process.poll() is not None:
+                    break
+
+                if timeout and (time.time() - start_time) > timeout:
+                    if logger:
+                        logger.error(f"⌛ Command timed out after {timeout} seconds")
+                    process.terminate()
+                    try:
+                        process.wait(timeout=5)
+                    except subprocess.TimeoutExpired:
+                        process.kill()
+                    return -1, output_lines
+                time.sleep(0.05)
+        else:
+            # 不捕获输出，直接等待结束
+            process.wait(timeout=timeout)
+
+    except Exception as e:
+        if logger:
+            logger.exception(f"Error during command execution: {e}")
+        process.kill()
+        raise e
+
+    return process.returncode, output_lines
+
+
+def run_command_build_fuzz(
     cmd: str,
     oss_fuzz_dir: Path,
     project: str = "",
     allowed_exit_codes: Maybe[list[int]] = Maybe.empty,
     skip_yes: bool = False
 ) -> int:
-    """Execute a command and return the exit code (no stdout/stderr capture)"""
+    """build_fuzz.py 中使用的 run_command，简化版，抛异常"""
     allowed_codes = allowed_exit_codes.value_or([0])
     cmd_str = f"yes | {cmd}" if not skip_yes else cmd
-    logging.debug(f"Executing command [{project}]: {cmd_str}")
-
-    try:
-        process = subprocess.Popen(
-            cmd_str,
-            shell=True,
-            cwd=str(oss_fuzz_dir)
-        )
-        exit_code = process.wait()
-
-        if exit_code in allowed_codes:
-            return exit_code
-
+    exit_code, _ = _run_subprocess(cmd_str, cwd=oss_fuzz_dir)
+    if exit_code not in allowed_codes:
         error_msg = f"Command failed (exit code: {exit_code})"
         if project:
             error_msg += f" for project: {project}"
         raise CommandError(error_msg, project=project, exit_code=exit_code)
+    return exit_code
+
+
+def run_command_fuzz_all_targets(
+    cmd: str,
+    log_msg: str,
+    logger: logging.Logger,
+    allowed_exit_codes: Maybe[list[int]] = Maybe.empty,
+    timeout: int = 3600,
+) -> bool:
+    """run_fuzz_all_targets_print1.py 中使用，带实时日志与超时，返回bool"""
+    logger.info(f"▶️ {log_msg}...")
+    logger.debug(f"   $ {cmd}")
+
+    allowed_codes = allowed_exit_codes.value_or([])
+    exit_code, _ = _run_subprocess(cmd, capture_output=True, timeout=timeout, logger=logger)
+    if exit_code not in [0, *allowed_codes]:
+        logger.error(f"❌ Command execution failed, exit code: {exit_code}")
+        return False
+    return True
 
-    except FileNotFoundError as e:
-        raise CommandError(f"Command not found: {cmd.split()[0]}", project=project) from e
-    except OSError as e:
-        raise CommandError(f"System error: {e}", project=project) from e
-    except subprocess.SubprocessError as e:
-        raise CommandError(f"Subprocess error: {e}", project=project) from e

fuzz/run_fuzz_all_targets_print1.py

@@ -25,7 +25,7 @@
 from pathlib import Path
 from multiprocessing import Pool, cpu_count
 from returns.maybe import Maybe, Nothing, Some
-
+from command_util import run_command_fuzz_all_targets as run_command
 
 
 

image_build_results.json

@@ -1,8 +1,4 @@
 {
-    "asteval": true,
-    "astroid": true,
-    "asttokens": true,
-    "attrs": true,
     "autoflake": true,
     "autopep8": true,
     "azure-sdk-for-python": true,