X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FFormat.pm;h=cca52ed5fc437700b38aa381e61fed7e709d51b4;hp=866345f2a90f8721c5e680b9db8f97966ac39577;hb=837911b376705e31b1affbe5679f92e072d2601e;hpb=513eadc35a570c8e971f3cc2c2eaede340f4895d

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 866345f..cca52ed 100644
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -6,31 +6,63 @@ use warnings;
 use parent qw/Exporter/;
 no if $] > 5.017011, warnings => 'experimental::smartmatch';
 
-use POSIX qw//;
+use Expect::Simple;
 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::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 POSIX qw/mkfifo/;
+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);
+
+sub runvm {
+	my ($name) = @_;
+	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,
+	});
+}
 
-	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 stopvms { %vm = () }
+
+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);
+	} else {
+		my $ret = fork // die "Cannot fork\n";
+		if ($ret) {
+			waitpid $ret, 0;
+		} else {
+			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{
@@ -39,36 +71,18 @@ 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};
-			waitpid $ret, 0;
-			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 ne '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 = ('--nobody');
+		push @args, '--no-close' 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}}
 	}
 }
 
@@ -76,15 +90,22 @@ 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;
+	} catch {
+		die "Compile error\n"
+	} finally {
+		$Gruntmaster::Daemon::errors .= read_file 'errors';
+		$Gruntmaster::Daemon::errors .= "\n" if -s 'errors';
+		unlink 'errors';
+	};
 }
 
 sub prepare_files{
 	my $meta = shift;
+	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);