update sub import/inject

This commit is contained in:
2026-04-17 22:45:10 +02:00
parent d45d367d89
commit eebb596773

View File

@ -116,65 +116,65 @@ sub import_trace {
notify("Importing $experiment trace..."); notify("Importing $experiment trace...");
system( system(
"$fail_import", "$fail_import", "--database-option-file",
"--database-option-file $remote_db_conf", $remote_db_conf, "-t",
"-t $remote_builds_dir/$experiment/trace.pb", "$remote_builds_dir/$experiment/trace.pb", "-i",
"-i MemoryImporter", "MemoryImporter", "-e",
"-e $remote_builds_dir/$experiment/system.elf", "$remote_builds_dir/$experiment/system.elf", "-v",
"-v $experiment", $experiment, "-b",
"-b mem" "mem"
); );
system( system(
"$fail_import", "$fail_import", "--database-option-file",
"--database-option-file $remote_db_conf", $remote_db_conf, "-t",
"-t $remote_builds_dir/$experiment/trace.pb", "$remote_builds_dir/$experiment/trace.pb", "-i",
"-i RegisterImporter", "RegisterImporter", "-e",
"-e $remote_builds_dir/$experiment/system.elf", "$remote_builds_dir/$experiment/system.elf", "-v",
"-v $experiment", $experiment, "-b",
"-b regs --flags" "regs", "--flags"
); );
system( system(
"$fail_import", "$fail_import", "--database-option-file",
"--database-option-file $remote_db_conf", $remote_db_conf, "-t",
"-t $remote_builds_dir/$experiment/trace.pb", "$remote_builds_dir/$experiment/trace.pb", "-i",
"-i RegisterImporter", "RegisterImporter", "-e",
"-e $remote_builds_dir/$experiment/system.elf", "$remote_builds_dir/$experiment/system.elf", "-v",
"-v $experiment", $experiment, "-b",
"-b ip --no-gp --ip" "ip", "--no-gp",
"--ip"
); );
system( system(
"$fail_import", "$fail_import", "--database-option-file",
"--database-option-file $remote_db_conf", $remote_db_conf, "-t",
"-t $remote_builds_dir/$experiment/trace.pb", "$remote_builds_dir/$experiment/trace.pb", "-i",
"-i ElfImporter", "ElfImporter", "--objdump",
"--objdump objdump -e $remote_builds_dir/$experiment/system.elf", "objdump", "-e",
"-v $experiment", "$remote_builds_dir/$experiment/system.elf", "-v",
"-b ip" $experiment, "-b",
"ip"
); );
system( system(
"$fail_import", "$fail_import", "--database-option-file",
"--database-option-file $remote_db_conf", $remote_db_conf, "-t",
"-t $remote_builds_dir/$experiment/trace.pb", "$remote_builds_dir/$experiment/trace.pb", "-i",
"-i ElfImporter", "ElfImporter", "--objdump",
"--objdump objdump -e $remote_builds_dir/$experiment/system.elf", "objdump", "-e",
"-v $experiment", "$remote_builds_dir/$experiment/system.elf", "-v",
"-b mem" $experiment, "-b",
"mem"
); );
system( system(
"$fail_import", "$fail_import", "--database-option-file",
"--database-option-file $remote_db_conf", $remote_db_conf, "-t",
"-t $remote_builds_dir/$experiment/trace.pb", "$remote_builds_dir/$experiment/trace.pb", "-i",
"-i ElfImporter", "ElfImporter", "--objdump",
"--objdump objdump -e $remote_builds_dir/$experiment/system.elf", "objdump", "-e",
"-v $experiment", "$remote_builds_dir/$experiment/system.elf", "-v",
"-b regs" "$experiment", "-b",
); "regs"
system(
"$fail_prune",
"--database-option-file $remote_db_conf",
"-v $experiment",
"-b %%", "--overwrite"
); );
system( "$fail_prune", "--database-option-file", "$remote_db_conf",
"-v", $experiment, "-b", "%%", "--overwrite" );
notify("Importing $experiment trace complete."); notify("Importing $experiment trace complete.");
} }
@ -191,12 +191,11 @@ sub inject {
# child -> server # child -> server
exec( exec(
$fail_server, $fail_server, "--port",
"--port $fail_server_port", $fail_server_port, "--database-option-file",
"--database-option-file $remote_db_conf", $remote_db_conf, "-v",
"-v $experiment", $experiment, "-b",
"-b %", "%", "--inject-single-bit",
"--inject-single-bit",
"--inject-registers" "--inject-registers"
) or die "exec server failed: $!"; ) or die "exec server failed: $!";
} }
@ -206,12 +205,12 @@ sub inject {
system( system(
"nice", "nice",
$bochs_runner, $bochs_runner,
"-V $fail_share/vgabios.bin", "-V", "$fail_share/vgabios.bin",
"-b $fail_share/BIOS-bochs-latest", "-b", "$fail_share/BIOS-bochs-latest",
"-f $fail_inject", "-f", "$fail_inject",
"-e $remote_builds_dir/$experiment/system.elf", "-e", "$remote_builds_dir/$experiment/system.elf",
"-i $remote_builds_dir/$experiment/system.iso", "-i", "$remote_builds_dir/$experiment/system.iso",
"-j $count", "-j", $count,
"--", "--",
"-Wf,--server-port=$fail_server_port", "-Wf,--server-port=$fail_server_port",
"-Wf,--state-dir=$remote_builds_dir/$experiment/state", "-Wf,--state-dir=$remote_builds_dir/$experiment/state",
@ -223,7 +222,7 @@ sub inject {
"-Wf,--ok-marker=fail_marker_positive", "-Wf,--ok-marker=fail_marker_positive",
"-Wf,--fail-marker=fail_marker_negative", "-Wf,--fail-marker=fail_marker_negative",
"-Wf,--detected-marker=fail_marker_detected", "-Wf,--detected-marker=fail_marker_detected",
"> /dev/null" ">/dev/null"
) or die "client failed: $?"; ) or die "client failed: $?";
kill 'TERM', $pid; kill 'TERM', $pid;