NERVsystems · pdfinn · Feb 12, 2026 · Feb 10, 2026 · Feb 10, 2026
diff --git a/benchmarks/run-comparison.sh b/benchmarks/run-comparison.sh
@@ -218,9 +218,12 @@ run_contestant() {
         local outfile="$TMPDIR/${label}_run${run}.txt"
         echo -n "  $label run $run/$RUNS... "
 
-        if timeout "$TIMEOUT_SEC" "$@" > "$outfile" 2>&1; then
-            local total
-            total=$(grep "Total Time:" "$outfile" | grep -o '[0-9]*' || echo "999999999")
+        timeout "$TIMEOUT_SEC" "$@" > "$outfile" 2>&1 &
+        wait $! 2>/dev/null || true
+
+        local total
+        total=$(grep "Total Time:" "$outfile" | grep -o '[0-9]*' || echo "")
+        if [ -n "$total" ] && [ "$total" -gt 0 ] 2>/dev/null; then
             echo "${total} ms"
             if [ "$total" -lt "$best_total" ]; then
                 best_total=$total
@@ -280,13 +283,21 @@ fi
 if [ "$HAVE_EMU" -eq 1 ]; then
     EMUROOT="-r$ROOT"
 
+    # The emulator doesn't exit after running a dis file, so use a shorter
+    # timeout. The benchmark completes in well under 60s; timeout then kills
+    # the lingering emulator process.
+    SAVED_TIMEOUT=$TIMEOUT_SEC
+    TIMEOUT_SEC=60
+
     run_contestant "Limbo_JIT" "$EMU" "$EMUROOT" -c1 dis/jitbench.dis
     JIT_FILE=$BEST_FILE
     echo ""
 
     run_contestant "Limbo_Interp" "$EMU" "$EMUROOT" -c0 dis/jitbench.dis
     INTERP_FILE=$BEST_FILE
     echo ""
+
+    TIMEOUT_SEC=$SAVED_TIMEOUT
 fi
 
 # --- Parse best-run results into per-contestant files ---

diff --git a/dis/9660srv.dis b/dis/9660srv.dis
diff --git a/dis/calc.dis b/dis/calc.dis
diff --git a/dis/disdep.dis b/dis/disdep.dis
diff --git a/dis/emuinit.dis b/dis/emuinit.dis
diff --git a/dis/fc.dis b/dis/fc.dis
diff --git a/dis/gzip.dis b/dis/gzip.dis
diff --git a/dis/iostats.dis b/dis/iostats.dis
diff --git a/dis/jitbench.dis b/dis/jitbench.dis
diff --git a/dis/jitbench2.dis b/dis/jitbench2.dis
diff --git a/dis/jitbug.dis b/dis/jitbug.dis
diff --git a/dis/jitbug2.dis b/dis/jitbug2.dis
diff --git a/dis/jitshift.dis b/dis/jitshift.dis
diff --git a/dis/jittest.dis b/dis/jittest.dis
diff --git a/dis/js.dis b/dis/js.dis
diff --git a/dis/lib/bufio.dis b/dis/lib/bufio.dis
diff --git a/dis/lib/login.dis b/dis/lib/login.dis
diff --git a/dis/lib/menuhit.dis b/dis/lib/menuhit.dis
diff --git a/dis/lib/midi.dis b/dis/lib/midi.dis
diff --git a/dis/lib/parseman.dis b/dis/lib/parseman.dis
diff --git a/dis/lib/profile.dis b/dis/lib/profile.dis
diff --git a/dis/lib/readjpg.dis b/dis/lib/readjpg.dis
diff --git a/dis/lib/string.dis b/dis/lib/string.dis
diff --git a/dis/lib/testing.dis b/dis/lib/testing.dis
diff --git a/dis/lib/tkclient.dis b/dis/lib/tkclient.dis
diff --git a/dis/lib/wmclient.dis b/dis/lib/wmclient.dis
diff --git a/dis/lib/wmlib.dis b/dis/lib/wmlib.dis
diff --git a/dis/lib/xml.dis b/dis/lib/xml.dis
diff --git a/dis/man2html.dis b/dis/man2html.dis
diff --git a/dis/seq.dis b/dis/seq.dis
diff --git a/dis/test9p.dis b/dis/test9p.dis
diff --git a/dis/time.dis b/dis/time.dis
diff --git a/dis/units.dis b/dis/units.dis
diff --git a/utils/mk/mk b/utils/mk/mk