20260420_2 完成输出report和ccr优化，snapshot耗时优化到70多秒

scripts/compare/run_perf_compare_quick_remote.sh

@@ -10,6 +10,7 @@ Usage:
     [--ssh-target <user@host>] \
     [--rpki-client-bin <path>] \
     [--libtls-path <path>] \
+    [--rp-run-mode <serial|parallel>] \
     [--ours-extra-args '<args>'] \
     [--dry-run]
 EOF
@@ -21,6 +22,7 @@ REMOTE_ROOT=""
 SSH_TARGET="${SSH_TARGET:-root@47.251.56.108}"
 RPKI_CLIENT_BIN="${RPKI_CLIENT_BIN:-/home/yuyr/dev/rpki-client-9.7/build-m5/src/rpki-client}"
 LIBTLS_PATH="${LIBTLS_PATH:-/home/yuyr/dev/rpki-client-9.7/.deps/libtls/root/usr/lib/x86_64-linux-gnu/libtls.so.28.0.0}"
+RP_RUN_MODE="${RP_RUN_MODE:-serial}"
 OURS_EXTRA_ARGS="${OURS_EXTRA_ARGS:-}"
 DRY_RUN=0
 
@@ -31,6 +33,7 @@ while [[ $# -gt 0 ]]; do
     --ssh-target) SSH_TARGET="$2"; shift 2 ;;
     --rpki-client-bin) RPKI_CLIENT_BIN="$2"; shift 2 ;;
     --libtls-path) LIBTLS_PATH="$2"; shift 2 ;;
+    --rp-run-mode) RP_RUN_MODE="$2"; shift 2 ;;
     --ours-extra-args) OURS_EXTRA_ARGS="$2"; shift 2 ;;
     --dry-run) DRY_RUN=1; shift ;;
     -h|--help) usage; exit 0 ;;
@@ -39,6 +42,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 [[ -n "$RUN_ROOT" && -n "$REMOTE_ROOT" ]] || { usage >&2; exit 2; }
+[[ "$RP_RUN_MODE" == "serial" || "$RP_RUN_MODE" == "parallel" ]] || { echo "invalid --rp-run-mode: $RP_RUN_MODE" >&2; usage; exit 2; }
 [[ "$DRY_RUN" -eq 1 || -x "$RPKI_CLIENT_BIN" ]] || { echo "rpki-client binary not executable: $RPKI_CLIENT_BIN" >&2; exit 2; }
 [[ "$DRY_RUN" -eq 1 || -f "$LIBTLS_PATH" ]] || { echo "libtls not found: $LIBTLS_PATH" >&2; exit 2; }
 
@@ -64,6 +68,7 @@ scope=APNIC+ARIN mixed release two-step synchronized compare
 run_root=$RUN_ROOT
 remote_root=$REMOTE_ROOT
 ssh_target=$SSH_TARGET
+rp_run_mode=$RP_RUN_MODE
 ours_extra_args=$OURS_EXTRA_ARGS
 EOF2
   exit 0
@@ -76,12 +81,10 @@ cleanup_remote() {
 }
 trap cleanup_remote EXIT
 
-if [[ ! -x "$ROOT_DIR/target/release/rpki" || ! -x "$ROOT_DIR/target/release/ccr_to_compare_views" ]]; then
-  (
-    cd "$ROOT_DIR"
-    cargo build --release --bin rpki --bin ccr_to_compare_views
-  )
-fi
+(
+  cd "$ROOT_DIR"
+  cargo build --release --bin rpki --bin ccr_to_compare_views
+)
 
 ssh "$SSH_TARGET" "set -e; id -u _rpki-client >/dev/null 2>&1 || useradd -r -M -s /usr/sbin/nologin _rpki-client || true; rm -rf '$REMOTE_ROOT'; mkdir -p '$REMOTE_ROOT/bin' '$REMOTE_ROOT/lib' '$REMOTE_ROOT/state/ours' '$REMOTE_ROOT/state/rpki-client' '$REMOTE_ROOT/steps/step-001/ours' '$REMOTE_ROOT/steps/step-001/rpki-client' '$REMOTE_ROOT/steps/step-002/ours' '$REMOTE_ROOT/steps/step-002/rpki-client'"
 scp "$ROOT_DIR/target/release/rpki" "$APNIC_TAL" "$APNIC_TA" "$ARIN_TAL" "$ARIN_TA" "$SSH_TARGET:$REMOTE_ROOT/"
@@ -93,12 +96,13 @@ run_step() {
   local kind="$2"
   local local_step="$RUN_ROOT/steps/$step_id"
 
-  ssh "$SSH_TARGET" bash -s -- "$REMOTE_ROOT" "$step_id" "$kind" "$OURS_EXTRA_ARGS" <<'EOS'
+  ssh "$SSH_TARGET" bash -s -- "$REMOTE_ROOT" "$step_id" "$kind" "$OURS_EXTRA_ARGS" "$RP_RUN_MODE" <<'EOS'
 set -euo pipefail
 REMOTE_ROOT="$1"
 STEP_ID="$2"
 KIND="$3"
 OURS_EXTRA_ARGS="$4"
+RP_RUN_MODE="$5"
 
 cd "$REMOTE_ROOT"
 mkdir -p "steps/$STEP_ID/ours" "steps/$STEP_ID/rpki-client"
@@ -121,7 +125,7 @@ print(time.time() + 3.0)
 PY
 )"
 
-(
+run_ours() {
   python3 - <<'PY' "$START_EPOCH"
 import sys, time
 x = float(sys.argv[1])
@@ -166,10 +170,9 @@ json.dump(
     indent=2,
 )
 PY
-) &
-OURS_PID=$!
+}
 
-(
+run_client() {
   cd state/rpki-client
   python3 - <<'PY' "$START_EPOCH"
 import sys, time
@@ -213,11 +216,19 @@ json.dump(
     indent=2,
 )
 PY
-) &
-CLIENT_PID=$!
+}
 
-wait "$OURS_PID"
-wait "$CLIENT_PID"
+if [[ "$RP_RUN_MODE" == "parallel" ]]; then
+  run_ours &
+  OURS_PID=$!
+  run_client &
+  CLIENT_PID=$!
+  wait "$OURS_PID"
+  wait "$CLIENT_PID"
+else
+  run_ours
+  run_client
+fi
 EOS
 
   for rel in result.ccr round-result.json run.log stage-timing.json; do
@@ -275,13 +286,14 @@ PY
 run_step step-001 snapshot
 run_step step-002 delta
 
-python3 - <<'PY' "$RUN_ROOT/steps/step-001/step-summary.json" "$RUN_ROOT/steps/step-002/step-summary.json" "$RUN_ROOT/summary.json" "$OURS_EXTRA_ARGS"
+python3 - <<'PY' "$RUN_ROOT/steps/step-001/step-summary.json" "$RUN_ROOT/steps/step-002/step-summary.json" "$RUN_ROOT/summary.json" "$RP_RUN_MODE" "$OURS_EXTRA_ARGS"
 import json, sys
 steps = [json.load(open(p)) for p in sys.argv[1:3]]
 summary = {
     "workflowName": "性能对比测试快速版",
     "scope": "APNIC+ARIN mixed release two-step synchronized compare",
-    "oursExtraArgs": sys.argv[4],
+    "rpRunMode": sys.argv[4],
+    "oursExtraArgs": sys.argv[5],
     "steps": steps,
 }
 json.dump(summary, open(sys.argv[3], "w"), indent=2, ensure_ascii=False)