Enforce time limit for interactive verifiers

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon / Runner / Interactive.pm

diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
index aea381a4bdfab70f76c33a11b3ea9ee98c077840..115e7a198ac577b0d4cc555ca9fdfe3f1a8b8346 100644 (file)
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -10,32 +10,35 @@ use Log::Log4perl qw/get_logger/;
 use POSIX qw/mkfifo/;
 use Try::Tiny;
 
-our $VERSION = '5999.000_001';
+our $VERSION = '5999.000_002';
 
 ##################################################
 
 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';
-
-  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;
-       die [WA, "Wrong Answer"] if $?;
-  } else {
-       try {
-         $meta->{files}{int}{run}->($meta->{files}{int}{name}, fds => [qw/1 >fifo1 0 fifo2 4 >result/]);
-       } catch {
-         exit 1;
-       };
-       exit
-  }
-
-  scalar slurp 'result'
+       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';
+
+       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;
+               die [WA, "Wrong Answer"] if $?;
+       } else {
+               try {
+                       $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'
 }
 
 1;