X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=4a57d6a38b6757e99f6906645341efb21588095c;hp=a3b8a65fedd6af3fab66f889b79b3acccdefd9ca;hb=614700357f0af54cdba3ac21b7420738bda2f3fe;hpb=16724726149793a6a78336cc7c46e751c363df10

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index a3b8a65..4a57d6a 100644
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -6,12 +6,13 @@ 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/;
-use POSIX qw/mkfifo/;
 use String::ShellQuote qw/shell_quote/;
 use Try::Tiny;
 
@@ -20,24 +21,44 @@ our @EXPORT_OK = qw/prepare_files stopvms/;
 
 ##################################################
 
-our (%vm);
+our (%vm, %pid);
 
 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};
+	$cmd .= ' ' . $arg if $arg;
+	get_logger->trace("Starting VM $name ($cmd)");
+	$vm{$name} = Expect->spawn($cmd);
+	$vm{$name}->raw_pty(1);
+	$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) = @_;
@@ -47,22 +68,13 @@ sub execlist {
 		get_logger->trace("Running in VM $vm: $cmd");
 		$vm{$vm}->send($cmd);
 	} 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{
@@ -72,8 +84,8 @@ sub mkrun{
 		my ($name, %args) = @_;
 		get_logger->trace("Running $name...");
 		my $basename = fileparse $name, qr/[.][^.]*/s;
-		my @args = ('--nobody');
-		push @args, '--no-close' if $ENV{TEST_VERBOSE};
+		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};
@@ -82,7 +94,8 @@ sub mkrun{
 		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}
 	}
 }
 
@@ -92,25 +105,44 @@ sub prepare{
 
 	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 {
 		$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;
+		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
+		}
 	}
 }