use parent qw/Exporter/;
no if $] > 5.017011, warnings => 'experimental::smartmatch';
-use Expect::Simple;
+use Digest::SHA qw/sha256_hex/;
+use Expect;
use File::Basename qw/fileparse/;
+use File::Copy qw/cp/;
use File::Slurp qw/read_file write_file/;
use List::MoreUtils qw/natatime/;
use Log::Log4perl qw/get_logger/;
-use POSIX qw/mkfifo/;
use String::ShellQuote qw/shell_quote/;
+use Time::HiRes qw/time/;
use Try::Tiny;
-our $VERSION = '5999.000_004';
-our @EXPORT_OK = qw/prepare_files stopvms/;
+our $VERSION = '5999.000_005';
+our @EXPORT_OK = qw/copy_from_vm copy_to_vm prepare_files stopvms/;
##################################################
-our (%vm);
+our (%vm, %pid);
+
+sub copy_from_vm {
+ my ($file) = @_;
+ return unless $ENV{GRUNTMASTER_COPY_FROM_VM};
+ get_logger->trace("Copying $file from VM");
+ system $ENV{GRUNTMASTER_COPY_FROM_VM}, $file
+}
+
+sub copy_to_vm {
+ my ($file) = @_;
+ return unless $ENV{GRUNTMASTER_COPY_TO_VM};
+ get_logger->trace("Copying $file to VM");
+ system $ENV{GRUNTMASTER_COPY_TO_VM}, $file
+}
sub runvm {
- my ($name) = @_;
+ my ($name, $arg) = @_;
return unless $ENV{GRUNTMASTER_VM};
- mkfifo "$name.in", 0600;
- mkfifo "$name.out", 0600;
- get_logger->trace("Starting VM $name");
- $vm{$name} = Expect::Simple->new({
- Cmd => "$ENV{GRUNTMASTER_VM} $name",
- Prompt => '# ',
- DisconnectCmd => 'exit',
- RawPty => 1,
- Timeout => 10,
- });
+ my $cmd = $ENV{GRUNTMASTER_VM} . ' ' . $name;
+ $cmd .= ' ' . $arg if $arg;
+ get_logger->trace("Starting VM $name ($cmd)");
+ $vm{$name} = Expect->new;
+ $vm{$name}->raw_pty(1);
+ $vm{$name}->log_stdout(0);
+ $vm{$name}->spawn($cmd);
+ $vm{$name}->expect(50, '# ') or get_logger->logdie("Error while starting VM $name: ". $vm{$name}->error);
+ $vm{$name}->send("rm -rf ~/work/*\n");
+ $vm{$name}->expect(50, '# ')
}
-sub stopvms { %vm = () }
+sub stopvms {
+ $_->hard_close for values %vm;
+ %vm = %pid = ();
+}
+
+sub execlist_finish {
+ my ($vm, $kill) = @_;
+
+ if ($vm{$vm}) {
+ warn "Cannot kill VM\n" if $kill;
+ $vm{$vm}->expect(50, '# ');
+ } else {
+ kill KILL => $pid{$vm} if $kill;
+ waitpid $pid{$vm}, 0;
+ }
+ write_file "time-stop-$vm", time;
+ return if $kill;
+
+ my $er = "exec-result-$vm";
+ copy_from_vm $er;
+ die "gruntmaster-exec died\n" if -z $er;
+ my ($excode, $exmsg) = read_file $er;
+ unlink $er;
+ chomp ($excode, $exmsg); ## no critic (ProhibitParensWithBuiltins)
+ get_logger->trace("Exec result from $vm: $excode $exmsg");
+ die [$excode, $exmsg] if $excode; ## no critic (RequireCarping)
+}
sub execlist {
my ($vm, @args) = @_;
+ write_file "time-start-$vm", time;
my $er = "exec-result-$vm";
if ($vm{$vm}) {
my $cmd = ">$er " . shell_quote 'gruntmaster-exec', @args;
get_logger->trace("Running in VM $vm: $cmd");
- $vm{$vm}->send($cmd);
+ $vm{$vm}->send($cmd, "\n");
} else {
- my $ret = fork // die "Cannot fork\n";
- if ($ret) {
- waitpid $ret, 0;
- } else {
+ $pid{$vm} = fork // die "Cannot fork\n";
+ unless ($pid{$vm}) {
open STDOUT, '>', $er or die "Cannot open $er\n";
get_logger->trace("Running: gruntmaster-exec @args");
exec 'gruntmaster-exec', @args;
}
}
-
- die "gruntmaster-exec died\n" if -z $er;
- my ($excode, $exmsg) = read_file $er;
- unlink $er;
- chomp ($excode, $exmsg); ## no critic (ProhibitParensWithBuiltins)
- get_logger->trace("Exec result: $excode $exmsg");
- die [$excode, $exmsg] if $excode > 0; ## no critic (RequireCarping)
}
sub mkrun{
my ($name, %args) = @_;
get_logger->trace("Running $name...");
my $basename = fileparse $name, qr/[.][^.]*/s;
- my @args = ('--nobody');
+ my @args = ('--sudo');
+ push @args, '--keep-stderr' if $ENV{TEST_VERBOSE};
push @args, '--timeout', $args{timeout} if $args{timeout};
push @args, '--mlimit', $args{mlimit} if $args{mlimit};
push @args, '--olimit', $args{olimit} if $args{olimit};
while (my ($fd, $file) = $it->()) {
push @args, "--fd=$fd $file";
}
- execlist $basename, @args, "./$basename"
+ execlist $basename, @args, '--', "./$basename", @{$args{args}};
+ execlist_finish $basename unless $args{nonblocking}
}
}
try {
execlist prog => '--fd=1 >>errors', '--fd=2 >>errors', 'gruntmaster-compile', $format, $name;
+ execlist_finish 'prog';
} catch {
- die "Compile error\n"
+ my $exmsg = $_->[1];
+ die "Compile error ($exmsg)\n"
} finally {
+ copy_from_vm 'errors';
$Gruntmaster::Daemon::errors .= read_file 'errors';
- $Gruntmaster::Daemon::errors .= "\n";
+ $Gruntmaster::Daemon::errors .= "\n" if -s 'errors';
unlink 'errors';
};
}
sub prepare_files{
my $meta = shift;
- runvm $_ for keys %{$meta->{files}};
+ if ($meta->{runner} eq 'Interactive') {
+ runvm ver => '-serial unix:vm.sock,nowait,server';
+ runvm prog => '-serial unix:vm.sock,nowait';
+ } else {
+ runvm $_ for keys %{$meta->{files}};
+ }
for my $file (values %{$meta->{files}}) {
my ($format, $name, $content) = @{$file}{qw/format name content/};
$file->{run} = mkrun($format);
write_file $name, $content;
- prepare $name, $format;
+ copy_to_vm $name;
+ if ($ENV{GRUNTMASTER_CCACHE}) {
+ my $key = lc sha256_hex($content) . '-' . $format;
+ my $cachefn = "$ENV{GRUNTMASTER_CCACHE}/$key";
+ my $exefn = fileparse $name, qr/[.][^.]*/s;
+ if (cp $cachefn, $exefn) {
+ get_logger->trace("File $name found in compilation cache")
+ } else {
+ prepare $name, $format;
+ cp $exefn, $cachefn
+ }
+ } else {
+ prepare $name, $format
+ }
}
}