show experiment info when dropping databases in menu

lib.h gets included into the host module and the wasm module. For the
host module the attributes will be ignored.

flake.nix

@@ -417,7 +417,7 @@ rec {
         mariadb.client
         # dbeaver-bin
         # beekeeper-studio
-        tableplus
+        # tableplus
         lazysql
         iwasm
         wamrc

scripts/Util.pm

@@ -260,7 +260,8 @@ sub select_experiment {
       TUI::select_from_list( "Select Experiment", $multi, @exp_with_notes );
     die "No experiment selected" unless @selected_experiments;
 
-    map { s/(.*?)\s+\(.+\)$/$1/ } @selected_experiments;
+    @selected_experiments =
+      map { s/(.*?)\s+\(.+\)$/$1/r } @selected_experiments;
 
     return $multi == 1 ? @selected_experiments : $selected_experiments[0];
 }

scripts/menu.pl

@@ -109,6 +109,7 @@ my %handlers = (
 
         my @existing = Util::find_files($local_ghidra_projects);
 
+        # Determine if an experiment was already imported
         my $is_old = sub {
             my ($name) = @_;
             $name =~ s/:/-/g;
@@ -381,7 +382,11 @@ my %handlers = (
         );
     },
 
-    '20. Run Build in GDB' => sub {
+    '20. Open TablePlus (Mars)' => sub {
+        system('tableplus');
+    },
+
+    '21. Run Build in GDB' => sub {
         my @builds = grep { /linux/ } Util::find_subdirs($local_builds_dir);
         my @selected_builds =
           TUI::select_from_list( "Select Build to Run in GDB", 0, @builds );
@@ -500,11 +505,26 @@ my %handlers = (
     '99. Drop Databases (Mars)' => sub {
 
         # Drop databases on mars
-        my @db_names = Mars::db_list();
+        my @dbs = Mars::db_list();
+        my @dbs_with_notes;
+        foreach my $db (@dbs) {
+            my $info =
+              Util::read_experiment_info( $db =~ s/smchurla_//r =~ s/:/-/gr );
+
+            push @dbs_with_notes,
+              ( defined $info && length($info) > 0 )
+              ? sprintf( "%-60s (%s)", $db, $info )
+              : $db;
+        }
+
         my @selected_dbs =
           TUI::select_from_list( "Select Databases to Drop from Mars",
-            1, @db_names );
+            1, @dbs_with_notes );
         die "No database selected" unless @selected_dbs;
+
+        @selected_dbs =
+          map { s/(.*?)\s+\(.+\)$/$1/r } @selected_dbs;
+
         Mars::db_drop($_) for @selected_dbs;
     },
 );

scripts/runner.pl

@@ -35,148 +35,156 @@ my $result_browser     = "$fail_bin/resultbrowser.py";
 sub trace {
     my ($experiment) = @_;
 
-    Util::notify("Tracing $experiment...");
+    # Util::notify("Tracing $experiment...");
 
-    system(
+    my $trace_command = join " ", (
-        join " ",
+        "$bochs_runner",
-        (
+        "-V $fail_share/vgabios.bin",
-            "$bochs_runner",
+        "-b $fail_share/BIOS-bochs-latest",
-            "-V $fail_share/vgabios.bin",
+        "-1",
-            "-b $fail_share/BIOS-bochs-latest",
+        "-f $fail_trace",
-            "-1",
+        "-e $remote_builds_dir/$experiment/system.elf",
-            "-f $fail_trace",
+        "-i $remote_builds_dir/$experiment/system.iso",
-            "-e $remote_builds_dir/$experiment/system.elf",
+        "--",
-            "-i $remote_builds_dir/$experiment/system.iso",
+        "-Wf,--start-symbol=fail_start_trace",
-            "--",
+        "-Wf,--save-symbol=fail_start_trace",
-            "-Wf,--start-symbol=fail_start_trace",
+        "-Wf,--end-symbol=fail_stop_trace",
-            "-Wf,--save-symbol=fail_start_trace",
+        "-Wf,--state-file=$remote_builds_dir/$experiment/state",
-            "-Wf,--end-symbol=fail_stop_trace",
+        "-Wf,--trace-file=$remote_builds_dir/$experiment/trace.pb",
-            "-Wf,--state-file=$remote_builds_dir/$experiment/state",
+        "-Wf,--elf-file=$remote_builds_dir/$experiment/system.elf",
-            "-Wf,--trace-file=$remote_builds_dir/$experiment/trace.pb",
-            "-Wf,--elf-file=$remote_builds_dir/$experiment/system.elf"
 
-            # "-Wf,--full-trace",
+        # "-Wf,--full-trace",
-            # "-Wf,--check-bounds",
+        # "-Wf,--check-bounds",
-        )
+        ">$remote_builds_dir/$experiment/1_trace.log"
     );
+    say "Trace command: $trace_command";
+
+    system($trace_command);
 }
 
 sub import_trace {
     my ($experiment) = @_;
 
-    Util::notify("Importing $experiment trace...");
+    # Util::notify("Importing $experiment trace...");
 
     # Benchmark: ip
-    system(
+    my $import_ip_command = join " ", (
-        join " ",
+        "$fail_import",
-        (
+        "--database-option-file $remote_db_conf",
-            "$fail_import",
+        "-t $remote_builds_dir/$experiment/trace.pb",
-            "--database-option-file $remote_db_conf",
+        "-i RegisterImporter",
-            "-t $remote_builds_dir/$experiment/trace.pb",
+        "-e $remote_builds_dir/$experiment/system.elf",
-            "-i RegisterImporter",
+        "-v $experiment",
-            "-e $remote_builds_dir/$experiment/system.elf",
+        "-b ip",
-            "-v $experiment",
+        "--no-gp",    # Don't inject general purpose registers
-            "-b ip",
+        "--ip",       # Inject instruction pointer
-            "--no-gp",    # Don't inject general purpose registers
+        ">$remote_builds_dir/$experiment/2_import_ip.log"
-            "--ip"        # Inject instruction pointer
-        )
     );
+    say "Import IP command: $import_ip_command";
+
+    system($import_ip_command);
 
     # Benchmark: mem
-    system(
+    my $import_mem_command = join " ",
-        join " ",
+      (
-        (
+        "$fail_import",
-            "$fail_import",
+        "--database-option-file $remote_db_conf",
-            "--database-option-file $remote_db_conf",
+        "-t $remote_builds_dir/$experiment/trace.pb",
-            "-t $remote_builds_dir/$experiment/trace.pb",
+        "-i MemoryImporter",
-            "-i MemoryImporter",
+        "-e $remote_builds_dir/$experiment/system.elf",
-            "-e $remote_builds_dir/$experiment/system.elf",
+        "-v $experiment",
-            "-v $experiment",
+        "-b mem",
-            "-b mem"
+        ">$remote_builds_dir/$experiment/2_import_mem.log"
-        )
+      );
-    );
+    say "Import MEM command: $import_mem_command";
+
+    system($import_mem_command);
 
     # Benchmark: regs
-    system(
+    my $import_regs_command = join " ", (
-        join " ",
+        "$fail_import",
-        (
+        "--database-option-file $remote_db_conf",
-            "$fail_import",
+        "-t $remote_builds_dir/$experiment/trace.pb",
-            "--database-option-file $remote_db_conf",
+        "-i RegisterImporter",
-            "-t $remote_builds_dir/$experiment/trace.pb",
+        "-e $remote_builds_dir/$experiment/system.elf",
-            "-i RegisterImporter",
+        "-v $experiment",
-            "-e $remote_builds_dir/$experiment/system.elf",
+        "-b regs",
-            "-v $experiment",
+        "--flags",    # Inject flags register
-            "-b regs",
+        ">$remote_builds_dir/$experiment/2_import_regs.log"
-            "--flags"    # Inject flags register
-        )
     );
+    say "Import REGS command: $import_regs_command";
+
+    system($import_regs_command);
 
     # Import fulltrace for VisualFAIL
-    system(
+    # system(
-        join " ",
+    #     join " ",
-        (
+    #     (
-            "$fail_import",
+    #         "$fail_import",
-            "--database-option-file $remote_db_conf",
+    #         "--database-option-file $remote_db_conf",
-            "-t $remote_builds_dir/$experiment/trace.pb",
+    #         "-t $remote_builds_dir/$experiment/trace.pb",
-            "-i FullTraceImporter",
+    #         "-i FullTraceImporter",
-            "-e $remote_builds_dir/$experiment/system.elf",
+    #         "-e $remote_builds_dir/$experiment/system.elf",
-            "-v $experiment",
+    #         "-v $experiment",
-        )
+    #     )
-    );
+    # );
 
     # Import objdump disassembly + source files
-    system(
+    # system(
-        join " ",
+    #     join " ",
-        (
+    #     (
-            "$fail_import",
+    #         "$fail_import",
-            "--database-option-file $remote_db_conf",
+    #         "--database-option-file $remote_db_conf",
-            "-t $remote_builds_dir/$experiment/trace.pb",
+    #         "-t $remote_builds_dir/$experiment/trace.pb",
-            "-i ElfImporter",
+    #         "-i ElfImporter",
-            "-e $remote_builds_dir/$experiment/system.elf",
+    #         "-e $remote_builds_dir/$experiment/system.elf",
-            "-v $experiment",
+    #         "-v $experiment",
-            "-b ip",
+    #         "-b ip",
-            "--objdump objdump",
+    #         "--objdump objdump",
-            "--sources",
+    #
-        )
+    #         # "--sources",
-    );
+    #     )
-    system(
+    # );
-        join " ",
+    # system(
-        (
+    #     join " ",
-            "$fail_import",
+    #     (
-            "--database-option-file $remote_db_conf",
+    #         "$fail_import",
-            "-t $remote_builds_dir/$experiment/trace.pb",
+    #         "--database-option-file $remote_db_conf",
-            "-i ElfImporter",
+    #         "-t $remote_builds_dir/$experiment/trace.pb",
-            "-e $remote_builds_dir/$experiment/system.elf",
+    #         "-i ElfImporter",
-            "-v $experiment",
+    #         "-e $remote_builds_dir/$experiment/system.elf",
-            "-b mem",
+    #         "-v $experiment",
-            "--objdump objdump",
+    #         "-b mem",
-            "--sources",
+    #         "--objdump objdump",
-        )
+    #
-    );
+    #         # "--sources",
-    system(
+    #     )
-        join " ",
+    # );
-        (
+    # system(
-            "$fail_import",
+    #     join " ",
-            "--database-option-file $remote_db_conf",
+    #     (
-            "-t $remote_builds_dir/$experiment/trace.pb",
+    #         "$fail_import",
-            "-i ElfImporter",
+    #         "--database-option-file $remote_db_conf",
-            "-e $remote_builds_dir/$experiment/system.elf",
+    #         "-t $remote_builds_dir/$experiment/trace.pb",
-            "-v $experiment",
+    #         "-i ElfImporter",
-            "-b regs",
+    #         "-e $remote_builds_dir/$experiment/system.elf",
-            "--objdump objdump",
+    #         "-v $experiment",
-            "--sources",
+    #         "-b regs",
-        )
+    #         "--objdump objdump",
-    );
+    #
+    #         # "--sources",
+    #     )
+    # );
 
-    system(
+    my $prune_command = join " ",
-        join " ",
+      (
-        (
+        "$fail_prune",    "--database-option-file $remote_db_conf",
-            "$fail_prune",
+        "-v $experiment", "-b %%",
-            "--database-option-file $remote_db_conf",
+        "--overwrite",    ">$remote_builds_dir/$experiment/2_prune.log"
-            "-v $experiment",
+      );
-            "-b %%", "--overwrite"
+    say "Prune command: $prune_command";
-        )
+
-    );
+    system($prune_command);
 }
 
 sub inject {
@@ -186,6 +194,43 @@ sub inject {
 
     Util::notify("Injecting $experiment using $count cores...");
 
+    my $server_command = join " ", (
+        "$fail_server",
+
+        # "--port $fail_server_port",
+        "--database-option-file $remote_db_conf", "-v $experiment",
+        "-b %",                                   "--inject-single-bit",
+        "--inject-registers",
+        ">$remote_builds_dir/$experiment/3_server.log"
+    );
+    say "Server command: $server_command";
+
+    my $client_command = join " ", (
+        "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",
+        "--",
+
+        # "-Wf,--server-port=$fail_server_port",
+        "-Wf,--state-dir=$remote_builds_dir/$experiment/state",
+        "-Wf,--trap",
+        "-Wf,--catch-outerspace",
+        "-Wf,--catch-write-textsegment",
+        "-Wf,--timeout=500000",
+        "-Wf,--ok-marker=fail_marker_positive",
+        "-Wf,--fail-marker=fail_marker_negative",
+        "-Wf,--detected-marker=fail_marker_detected",
+
+        ">/dev/null"
+
+        # ">$remote_builds_dir/$experiment/4_client.log"
+    );
+    say "Client command: $client_command";
+
     say "Forking...";
     my $pid = fork();
     die "fork failed: $!" unless defined $pid;
@@ -193,52 +238,16 @@ sub inject {
     if ( $pid == 0 ) {
 
         # child -> server
-
         say "Running server in child process...";
-        exec(
+        exec($server_command) == 0 or die "exec server failed: $!";
-            join " ",
-            (
-                "$fail_server",
-                "--port $fail_server_port",
-                "--database-option-file $remote_db_conf",
-                "-v $experiment",
-                "-b %",
-                "--inject-single-bit",
-                "--inject-registers"
-            )
-        ) == 0 or die "exec server failed: $!";
     }
 
     # parent -> client
-
     say "Waiting for server...";
     sleep(10);
 
     say "Running client with $count cores in parent process";
-
+    system($client_command) == 0 or die "client failed: $?";
-    system(
-        join " ",
-        (
-            "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",
-            "--",
-            "-Wf,--server-port=$fail_server_port",
-            "-Wf,--state-dir=$remote_builds_dir/$experiment/state",
-            "-Wf,--trap",
-            "-Wf,--catch-outerspace",
-            "-Wf,--catch-write-textsegment",
-            "-Wf,--timeout=500000",
-            "-Wf,--ok-marker=fail_marker_positive",
-            "-Wf,--fail-marker=fail_marker_negative",
-            "-Wf,--detected-marker=fail_marker_detected",
-            ">/dev/null"
-        )
-    ) == 0 or die "client failed: $?";
 
     say "Killing server with pid $pid...";
     kill 'TERM', $pid;