runner kills possibly left-over generic-experiment-server process before

starting

scripts/build.pl

@@ -37,7 +37,7 @@ die "No experiment selected" unless @selected_experiments;
 
 # Select targets
 my @selected_targets =
-  TUI::select_from_list( "Select Targets Platforms", 1, @targets );
+  TUI::select_from_list( "Select Target Platforms", 1, @targets );
 die "No target selected" unless @selected_targets;
 
 # Select modes
@@ -45,6 +45,14 @@ my @selected_modes =
   TUI::select_from_list( "Select Execution Modes", 1, @modes );
 die "No mode selected" unless @selected_modes;
 
+# Select 0.info contents
+my $info = join " ", TUI::select_from_list( "Select '0.info' Contents for ", 1, (
+    "--catch-outer",
+    "--catch-text",
+    ".wamr_mmap",
+    ".wamr_aot",
+));
+
 # Build everything
 # TODO: linux-baremetal target is broken
 system( "mkdir", "-p", "$local_builds_dir" );
@@ -52,6 +60,9 @@ foreach my $experiment (@selected_experiments) {
     foreach my $target (@selected_targets) {
         foreach my $mode (@selected_modes) {
             just( "build", $experiment, $target, $mode );
+
+            system( "echo '$mode $info' > $local_root/build-$experiment/0.info" );
+
             system(
                 join " ",
                 (

scripts/menu.pl

@@ -72,9 +72,6 @@ my %handlers = (
         Mars::download_dir( "$remote_builds_dir/$_",
             "$local_archive_dir/" . $_ =~ s/:/-/gr )
           for @selected_dirs;
-
-        system( 'touch', "$local_archive_dir/" . $_ =~ s/:/-/gr . "/0.info" )
-          for @selected_dirs;
     },
 
     '04. Query Databases (Mars)' => sub {

scripts/runner.pl

@@ -279,6 +279,10 @@ my $experiment = $ARGV[0] or die "Usage: runner.pl <experiment>\n";
 Util::rewrite_file( $remote_db_conf, "database=",
     "database=${db_prefix}_$experiment\n" );
 
+say "Killing generic-experiment-server process if it's running...";
+system( "pkill", "-u", $db_user, "-f", "generic-experiment-server" );
+sleep(10);
+
 trace($experiment);
 import_trace($experiment);
 inject($experiment);