X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FInteractive.pm;h=d16e08e12a4f7d6b894d942a851d2d86e872de05;hp=1825fcdfa384bb3132afa7189b03e0c7983d7076;hb=3fa65372157835ebd1b9d286d18bd96cc832f756;hpb=fdb99417bb13ca0418a5ec8d9e240e29565225c4

diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
index 1825fcd..d16e08e 100644
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -10,7 +10,7 @@ use Log::Log4perl qw/get_logger/;
 use POSIX qw/mkfifo/;
 use Try::Tiny;
 
-our $VERSION = '5999.000_004';
+our $VERSION = '5999.000_005';
 
 ##################################################
 
@@ -18,39 +18,31 @@ sub run{
 	my ($test, $meta) = @_;
 	get_logger->trace("Running on test $test...");
 
-	mkfifo 'fifo1', 0600 or die $! unless -e 'fifo1';
-	mkfifo 'fifo2', 0600 or die $! unless -e 'fifo2';
-
-	if ($test == 1 && $ENV{GRUNTMASTER_VM}) {
-		exec 'cat <prog.out >ver.in' if fork;
-		exec 'cat <ver.out >prog.in' if fork;
-	}
-
-	my $ret = fork // get_logger->logdie("Fork failed: $!");
-	if ($ret) {
-		try {
-			my @fds = $ENV{GRUNTMASTER_VM} ? qw,0 /dev/ttyS1 1 >/dev/ttyS1, : qw/0 fifo1 1 >fifo2/;
-			$meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => \@fds, map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
-		} catch {
-			die $_
-		} finally {
-			waitpid $ret, 0;
-		};
-		die [WA, "Wrong Answer"] if $?;
-	} else {
-		try {
-			my @fds = $ENV{GRUNTMASTER_VM} ? qw,1 >/dev/ttyS1 0 /dev/ttyS1, : qw/1 >fifo1 0 fifo2/;
-			$meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [@fds, qw,4 >result,], args => [$test], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
-		} catch {
-			exit 1;
-		};
-		exit
-	}
+	mkfifo 'fifo1', 0600 or die "$!\n" unless -e 'fifo1';
+	mkfifo 'fifo2', 0600 or die "$!\n" unless -e 'fifo2';
+
+	my @fds = $ENV{GRUNTMASTER_VM} ? qw,0 /dev/ttyS1 1 >/dev/ttyS1, : qw/0 fifo1 1 >fifo2/;
+	$meta->{files}{prog}{run}->($meta->{files}{prog}{name}, nonblocking => 1, fds => \@fds, map { $_ => $meta->{$_} } qw/timeout mlimit/);
+
+	my $fail;
+	@fds = $ENV{GRUNTMASTER_VM} ? qw,1 >/dev/ttyS1 0 /dev/ttyS1, : qw/1 >fifo1 0 fifo2/;
+	try {
+		$meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [@fds, qw,4 >result,], args => [$test], map { $_ => $meta->{$_} } qw/timeout mlimit/);
+	} catch {
+		$fail = [WA, 'Wrong Answer'];
+	};
+
+	try {
+		Gruntmaster::Daemon::Format::execlist_finish(prog => !$fail);
+	} catch {
+		$fail = $_;
+	};
 
 	unlink 'fifo1';
 	unlink 'fifo2';
 
-	scalar slurp 'result'
+	die $fail if $fail; ## no critic (RequireCarping)
+	scalar slurp 'result' or 'Ok'
 }
 
 1;