X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=7b6f77bcc6c24527021b095e04dbe58f55181897;hp=5132fbd7387584d0f4ab8888a526e878c5f06ca3;hb=559c4eec958dfba14a2574ce939c838b93cb2711;hpb=d16a999c8e8166691919b98ccbe4bd9332a3543d

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 5132fbd..7b6f77b 100644
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -6,30 +6,76 @@ use warnings;
 use parent qw/Exporter/;
 no if $] > 5.017011, warnings => 'experimental::smartmatch';
 
-use POSIX qw//;
+use Digest::SHA qw/sha256_hex/;
+use Expect;
 use File::Basename qw/fileparse/;
-use File::Slurp qw/write_file/;
-use Gruntmaster::Daemon::Constants qw/TLE OLE DIED NZX/;
-use Time::HiRes qw/alarm/;
+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 IPC::Signal qw/sig_name sig_num/;
+use String::ShellQuote qw/shell_quote/;
+use Try::Tiny;
 
-our $VERSION = "5999.000_002";
-our @EXPORT_OK = qw/prepare_files/;
+our $VERSION = '5999.000_004';
+our @EXPORT_OK = qw/prepare_files stopvms/;
 
 ##################################################
 
-sub command_and_args{
-	my ($format, $basename) = @_;
+our (%vm, %pid);
+
+sub runvm {
+	my ($name, $arg) = @_;
+	return unless $ENV{GRUNTMASTER_VM};
+	my $cmd = $ENV{GRUNTMASTER_VM};
+	$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(5, '# ') or get_logger->logdie("Error while starting VM $name: ". $vm{$name}->error);
+}
+
+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)
+}
 
-	given($format) {
-		"./$basename" when [qw/C CPP PASCAL/];
-		"./$basename.exe" when 'MONO';
-		java => $basename when 'JAVA';
-		perl => $basename when 'PERL';
-		python => $basename when 'PYTHON';
-		default { die "Don't know how to execute format $format" }
+sub execlist {
+	my ($vm, @args) = @_;
+	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, "\n");
+	} 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;
+		}
 	}
 }
 
@@ -39,36 +85,19 @@ sub mkrun{
 		local *__ANON__ = 'mkrun_runner';
 		my ($name, %args) = @_;
 		get_logger->trace("Running $name...");
-		my $basename = fileparse $name, qr/\.[^.]*/;
-		my $ret = fork // die 'Cannot fork';
-		if ($ret) {
-			my $tle;
-			local $SIG{ALRM} = sub { kill KILL => $ret; $tle = 1};
-			alarm $args{timeout} if exists $args{timeout};
-			wait;
-			alarm 0;
-			my $sig = $? & 127;
-			my $signame = sig_name $sig;
-			die [TLE, "Time Limit Exceeded"] if $tle;
-			die [OLE, 'Output Limit Exceeded'] if $sig && $signame eq 'XFSZ';
-			die [DIED, "Crash (SIG$signame)"] if $sig && $signame != 'PIPE';
-			die [NZX, "Non-zero exit status: " . ($? >> 8)] if $? >> 8;
-		} else {
-			my @fds = exists $args{fds} ? @{$args{fds}} : ();
-			$^F = 50;
-			POSIX::close $_ for 0 .. $^F;
-			my $it = natatime 2, @fds;
-			while (my ($fd, $file) = $it->()) {
-				open my $fh, $file or die $!;
-				my $oldfd = fileno $fh;
-				if ($oldfd != $fd) {
-					POSIX::dup2 $oldfd, $fd or die $!;
-					POSIX::close $oldfd or die $!;
-				}
-			}
-			exec 'gruntmaster-exec', $args{mlimit} // 0, $args{olimit} // 0, command_and_args($format, $basename), exists $args{args} ? @{$args{args}} : ();
-			exit 42
+		my $basename = fileparse $name, qr/[.][^.]*/s;
+		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};
+		my @fds = exists $args{fds} ? @{$args{fds}} : ();
+		my $it = natatime 2, @fds;
+		while (my ($fd, $file) = $it->()) {
+			push @args, "--fd=$fd $file";
 		}
+		execlist $basename, @args, '--', "./$basename", @{$args{args}};
+		execlist_finish $basename unless $args{nonblocking}
 	}
 }
 
@@ -76,20 +105,46 @@ sub prepare{
 	my ($name, $format) = @_;
 	get_logger->trace("Preparing file $name...");
 
-	$Gruntmaster::Daemon::errors .= `gruntmaster-compile $format $name 2>&1`;
-	$Gruntmaster::Daemon::errors .= "\n";
-	die 'Compile error' if $?
+	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"
+	} finally {
+		$Gruntmaster::Daemon::errors .= read_file 'errors';
+		$Gruntmaster::Daemon::errors .= "\n" if -s 'errors';
+		unlink 'errors';
+	};
 }
 
 sub prepare_files{
 	my $meta = shift;
+	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}) {
+	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
+		}
 	}
 }