Fix VM usage and update ex/runvm

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon / Format.pm

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index a492e63c80ecc9bd06b8c389495dd05325b6cdb7..7b6f77bcc6c24527021b095e04dbe58f55181897 100644 (file)
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -6,8 +6,10 @@ use warnings;
 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/;
@@ -19,7 +21,7 @@ our @EXPORT_OK = qw/prepare_files stopvms/;
 
 ##################################################
 
-our (%vm);
+our (%vm, %pid);
 
 sub runvm {
        my ($name, $arg) = @_;
@@ -27,16 +29,38 @@ sub runvm {
        my $cmd = $ENV{GRUNTMASTER_VM};
        $cmd .= ' ' . $arg if $arg;
        get_logger->trace("Starting VM $name ($cmd)");
-       $vm{$name} = Expect::Simple->new({
-               Cmd => $cmd,
-               Prompt => '# ',
-               DisconnectCmd => '/sbin/poweroff -fn',
-               RawPty => 1,
-               Timeout => 10,
-       });
+       $vm{$name} = Expect->new;
+       $vm{$name}->raw_pty(1);
+       $vm{$name}->log_stdout(0);
+       $vm{$name}->spawn($cmd);
+       $vm{$name}->expect(5, '# ') or get_logger->logdie("Error while starting VM $name: ". $vm{$name}->error);
 }
 
-sub stopvms { %vm = () }
+sub stopvms {
+       kill KILL => $_->pid for values %vm;
+       %vm = %pid = ();
+}
+
+sub execlist_finish {
+       my ($vm, $kill) = @_;
+
+       if ($vm{$vm}) {
+               warn "Cannot kill VM" if $kill;
+               $vm{$vm}->expect(5, '# ');
+       } else {
+               kill KILL => $pid{$vm} if $kill;
+               waitpid $pid{$vm}, 0;
+       }
+       return if $kill;
+
+       my $er = "exec-result-$vm";
+       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) = @_;
@@ -44,24 +68,15 @@ sub execlist {
        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{
@@ -81,7 +96,8 @@ sub mkrun{
                while (my ($fd, $file) = $it->()) {
                        push @args, "--fd=$fd $file";
                }
-               execlist $basename, @args, '--', "./$basename", @{$args{args}}
+               execlist $basename, @args, '--', "./$basename", @{$args{args}};
+               execlist_finish $basename unless $args{nonblocking}
        }
 }
 
@@ -91,6 +107,7 @@ sub prepare{
 
        try {
                execlist prog => '--fd=1 >>errors', '--fd=2 >>errors', 'gruntmaster-compile', $format, $name;
+               execlist_finish 'prog';
        } catch {
                my $exmsg = $_->[1];
                die "Compile error ($exmsg)\n"
@@ -115,7 +132,19 @@ sub prepare_files{
 
                $file->{run} = mkrun($format);
                write_file $name, $content;
-               prepare $name, $format;
+               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
+               }
        }
 }