X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FInteractive.pm;h=81fe7b6030204bf2b5d395d955ab4dd73b80b091;hb=0dab5f26037acd56621c8c9f9b934c71007db832;hp=dfdf95b5982e93c4a540c555e1690f80db91c97e;hpb=99d3711026b621247d46551b38f19c34f26342bd;p=gruntmaster-daemon.git

diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
index dfdf95b..81fe7b6 100644
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -6,51 +6,40 @@ use warnings;
 
 use File::Slurp qw/slurp/;
 use Gruntmaster::Daemon::Constants qw/WA/;
+use Gruntmaster::Daemon::Format qw/copy_from_vm copy_to_vm/;
 use Log::Log4perl qw/get_logger/;
 use POSIX qw/mkfifo/;
 use Try::Tiny;
 
-our $VERSION = '5999.000_004';
+our $VERSION = '5999.000_005';
 
 ##################################################
 
 sub run{
 	my ($test, $meta) = @_;
 	get_logger->trace("Running on test $test...");
-
-	mkfifo 'fifo1', 0600 or die "$!\n" unless -e 'fifo1';
-	mkfifo 'fifo2', 0600 or die "$!\n" 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 $_ ## no critic (RequireCarping)
-		} finally {
-			waitpid $ret, 0;
-		};
-		die [WA, 'Wrong Answer'] if $?; ## no critic (RequireCarping)
-	} 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
-	}
-
-	unlink 'fifo1';
-	unlink 'fifo2';
-
-	scalar slurp 'result'
+	copy_to_vm 'input';
+
+	my @fds = $ENV{GRUNTMASTER_VM} ? qw,0 ../fifo1 1 >../fifo2, : 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 >../fifo1 0 ../fifo2, : qw/1 >fifo1 0 fifo2/;
+	try {
+		$meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [@fds, qw,3 input 4 >result,], args => [$test], map { $_ => $meta->{$_} } qw/timeout mlimit/);
+	} catch {
+		$fail = [WA, 'Wrong Answer'];
+	};
+
+	try {
+		Gruntmaster::Daemon::Format::execlist_finish(prog => !$fail);
+	} catch {
+		$fail = $_;
+	};
+
+	die $fail if $fail; ## no critic (RequireCarping)
+	copy_from_vm 'result';
+	scalar slurp 'result' or 'Ok'
 }
 
 1;