X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FInteractive.pm;h=aaaadd71de3e70c0c4558a0dab4989803efbcdd4;hp=21822d2c3514f69ff3a5061b53f40cb7ade2ccc2;hb=69ea9358b59a6d8bd566c3af22247e8c2e35320f;hpb=0a5a26a540897246f030a0869f399b5e2f261f74

diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
index 21822d2..aaaadd7 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_002';
+our $VERSION = '5999.000_003';
 
 ##################################################
 
@@ -23,18 +23,26 @@ sub run{
 
 	my $ret = fork // get_logger->logdie("Fork failed: $!");
 	if ($ret) {
-		$meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 fifo1 1 >fifo2/], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
-		waitpid $ret, 0;
+		try {
+			$meta->{files}{prog}{run}->($meta->{files}{prog}{name}, fds => [qw/0 fifo1 1 >fifo2/], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
+		} catch {
+			die $_
+		} finally {
+			waitpid $ret, 0;
+		};
 		die [WA, "Wrong Answer"] if $?;
 	} else {
 		try {
-			$meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [qw/1 >fifo1 0 fifo2 4 >result/]);
+			$meta->{files}{ver}{run}->($meta->{files}{ver}{name}, fds => [qw/1 >fifo1 0 fifo2 4 >result/], args => [$test], map {defined $meta->{$_} ? ($_ => $meta->{$_}) : () } qw/timeout mlimit/);
 		} catch {
 			exit 1;
 		};
 		exit
 	}
 
+	unlink 'fifo1';
+	unlink 'fifo2';
+
 	scalar slurp 'result'
 }
 
@@ -50,13 +58,13 @@ Gruntmaster::Daemon::Runner::Interactive - Make an interactive verifier talk to
 =head1 SYNOPSIS
 
   use Gruntmaster::Daemon::Runner::Interactive;
-  Gruntmaster::Daemon::Runner::Interactive->run(5, $meta);
+  Gruntmaster::Daemon::Runner::Interactive::run(5, $meta);
 
 =head1 DESCRIPTION
 
 B<WARNING: This runner is experimental!>
 
-Gruntmaster::Daemon::Runner::Interactive is a runner which runs the program and an interactive verifier in parallel, connecting each program's STDIN to the other's STDOUT. The verifier, C<< $meta->{files}{int} >>, should return nonzero if the program gives an incorrect answer, and print the test score to fd 4 then return 0 if the answer is correct.
+Gruntmaster::Daemon::Runner::Interactive is a runner which runs the program and an interactive verifier in parallel, connecting each program's STDIN to the other's STDOUT. The verifier, C<< $meta->{files}{ver} >>, should return nonzero if the program gives an incorrect answer, or print the test score to fd 4 then return 0 if the answer is correct.
 
 =head1 AUTHOR