From eebb596773332b9fa20dcc47e293c7c4caa67a54 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Fri, 17 Apr 2026 22:45:10 +0200 Subject: [PATCH] update sub import/inject --- scripts/runner.pl | 121 +++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/scripts/runner.pl b/scripts/runner.pl index 4fa3a0d..09be86e 100644 --- a/scripts/runner.pl +++ b/scripts/runner.pl @@ -116,65 +116,65 @@ sub import_trace { notify("Importing $experiment trace..."); system( - "$fail_import", - "--database-option-file $remote_db_conf", - "-t $remote_builds_dir/$experiment/trace.pb", - "-i MemoryImporter", - "-e $remote_builds_dir/$experiment/system.elf", - "-v $experiment", - "-b mem" + "$fail_import", "--database-option-file", + $remote_db_conf, "-t", + "$remote_builds_dir/$experiment/trace.pb", "-i", + "MemoryImporter", "-e", + "$remote_builds_dir/$experiment/system.elf", "-v", + $experiment, "-b", + "mem" ); system( - "$fail_import", - "--database-option-file $remote_db_conf", - "-t $remote_builds_dir/$experiment/trace.pb", - "-i RegisterImporter", - "-e $remote_builds_dir/$experiment/system.elf", - "-v $experiment", - "-b regs --flags" + "$fail_import", "--database-option-file", + $remote_db_conf, "-t", + "$remote_builds_dir/$experiment/trace.pb", "-i", + "RegisterImporter", "-e", + "$remote_builds_dir/$experiment/system.elf", "-v", + $experiment, "-b", + "regs", "--flags" ); system( - "$fail_import", - "--database-option-file $remote_db_conf", - "-t $remote_builds_dir/$experiment/trace.pb", - "-i RegisterImporter", - "-e $remote_builds_dir/$experiment/system.elf", - "-v $experiment", - "-b ip --no-gp --ip" + "$fail_import", "--database-option-file", + $remote_db_conf, "-t", + "$remote_builds_dir/$experiment/trace.pb", "-i", + "RegisterImporter", "-e", + "$remote_builds_dir/$experiment/system.elf", "-v", + $experiment, "-b", + "ip", "--no-gp", + "--ip" ); system( - "$fail_import", - "--database-option-file $remote_db_conf", - "-t $remote_builds_dir/$experiment/trace.pb", - "-i ElfImporter", - "--objdump objdump -e $remote_builds_dir/$experiment/system.elf", - "-v $experiment", - "-b ip" + "$fail_import", "--database-option-file", + $remote_db_conf, "-t", + "$remote_builds_dir/$experiment/trace.pb", "-i", + "ElfImporter", "--objdump", + "objdump", "-e", + "$remote_builds_dir/$experiment/system.elf", "-v", + $experiment, "-b", + "ip" ); system( - "$fail_import", - "--database-option-file $remote_db_conf", - "-t $remote_builds_dir/$experiment/trace.pb", - "-i ElfImporter", - "--objdump objdump -e $remote_builds_dir/$experiment/system.elf", - "-v $experiment", - "-b mem" + "$fail_import", "--database-option-file", + $remote_db_conf, "-t", + "$remote_builds_dir/$experiment/trace.pb", "-i", + "ElfImporter", "--objdump", + "objdump", "-e", + "$remote_builds_dir/$experiment/system.elf", "-v", + $experiment, "-b", + "mem" ); system( - "$fail_import", - "--database-option-file $remote_db_conf", - "-t $remote_builds_dir/$experiment/trace.pb", - "-i ElfImporter", - "--objdump objdump -e $remote_builds_dir/$experiment/system.elf", - "-v $experiment", - "-b regs" - ); - system( - "$fail_prune", - "--database-option-file $remote_db_conf", - "-v $experiment", - "-b %%", "--overwrite" + "$fail_import", "--database-option-file", + $remote_db_conf, "-t", + "$remote_builds_dir/$experiment/trace.pb", "-i", + "ElfImporter", "--objdump", + "objdump", "-e", + "$remote_builds_dir/$experiment/system.elf", "-v", + "$experiment", "-b", + "regs" ); + system( "$fail_prune", "--database-option-file", "$remote_db_conf", + "-v", $experiment, "-b", "%%", "--overwrite" ); notify("Importing $experiment trace complete."); } @@ -191,12 +191,11 @@ sub inject { # child -> server exec( - $fail_server, - "--port $fail_server_port", - "--database-option-file $remote_db_conf", - "-v $experiment", - "-b %", - "--inject-single-bit", + $fail_server, "--port", + $fail_server_port, "--database-option-file", + $remote_db_conf, "-v", + $experiment, "-b", + "%", "--inject-single-bit", "--inject-registers" ) or die "exec server failed: $!"; } @@ -206,12 +205,12 @@ sub inject { system( "nice", $bochs_runner, - "-V $fail_share/vgabios.bin", - "-b $fail_share/BIOS-bochs-latest", - "-f $fail_inject", - "-e $remote_builds_dir/$experiment/system.elf", - "-i $remote_builds_dir/$experiment/system.iso", - "-j $count", + "-V", "$fail_share/vgabios.bin", + "-b", "$fail_share/BIOS-bochs-latest", + "-f", "$fail_inject", + "-e", "$remote_builds_dir/$experiment/system.elf", + "-i", "$remote_builds_dir/$experiment/system.iso", + "-j", $count, "--", "-Wf,--server-port=$fail_server_port", "-Wf,--state-dir=$remote_builds_dir/$experiment/state", @@ -223,7 +222,7 @@ sub inject { "-Wf,--ok-marker=fail_marker_positive", "-Wf,--fail-marker=fail_marker_negative", "-Wf,--detected-marker=fail_marker_detected", - "> /dev/null" + ">/dev/null" ) or die "client failed: $?"; kill 'TERM', $pid;