runner kills possibly left-over generic-experiment-server process before
starting
This commit is contained in:
@ -37,7 +37,7 @@ die "No experiment selected" unless @selected_experiments;
|
|||||||
|
|
||||||
# Select targets
|
# Select targets
|
||||||
my @selected_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;
|
die "No target selected" unless @selected_targets;
|
||||||
|
|
||||||
# Select modes
|
# Select modes
|
||||||
@ -45,6 +45,14 @@ my @selected_modes =
|
|||||||
TUI::select_from_list( "Select Execution Modes", 1, @modes );
|
TUI::select_from_list( "Select Execution Modes", 1, @modes );
|
||||||
die "No mode selected" unless @selected_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
|
# Build everything
|
||||||
# TODO: linux-baremetal target is broken
|
# TODO: linux-baremetal target is broken
|
||||||
system( "mkdir", "-p", "$local_builds_dir" );
|
system( "mkdir", "-p", "$local_builds_dir" );
|
||||||
@ -52,6 +60,9 @@ foreach my $experiment (@selected_experiments) {
|
|||||||
foreach my $target (@selected_targets) {
|
foreach my $target (@selected_targets) {
|
||||||
foreach my $mode (@selected_modes) {
|
foreach my $mode (@selected_modes) {
|
||||||
just( "build", $experiment, $target, $mode );
|
just( "build", $experiment, $target, $mode );
|
||||||
|
|
||||||
|
system( "echo '$mode $info' > $local_root/build-$experiment/0.info" );
|
||||||
|
|
||||||
system(
|
system(
|
||||||
join " ",
|
join " ",
|
||||||
(
|
(
|
||||||
|
|||||||
@ -72,9 +72,6 @@ my %handlers = (
|
|||||||
Mars::download_dir( "$remote_builds_dir/$_",
|
Mars::download_dir( "$remote_builds_dir/$_",
|
||||||
"$local_archive_dir/" . $_ =~ s/:/-/gr )
|
"$local_archive_dir/" . $_ =~ s/:/-/gr )
|
||||||
for @selected_dirs;
|
for @selected_dirs;
|
||||||
|
|
||||||
system( 'touch', "$local_archive_dir/" . $_ =~ s/:/-/gr . "/0.info" )
|
|
||||||
for @selected_dirs;
|
|
||||||
},
|
},
|
||||||
|
|
||||||
'04. Query Databases (Mars)' => sub {
|
'04. Query Databases (Mars)' => sub {
|
||||||
|
|||||||
@ -279,6 +279,10 @@ my $experiment = $ARGV[0] or die "Usage: runner.pl <experiment>\n";
|
|||||||
Util::rewrite_file( $remote_db_conf, "database=",
|
Util::rewrite_file( $remote_db_conf, "database=",
|
||||||
"database=${db_prefix}_$experiment\n" );
|
"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);
|
trace($experiment);
|
||||||
import_trace($experiment);
|
import_trace($experiment);
|
||||||
inject($experiment);
|
inject($experiment);
|
||||||
|
|||||||
Reference in New Issue
Block a user