Improve Interactive runner

[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 03c3911398f199481bbaaad8d336bb38771c6aa0..da51380200c0addf58ae8c9bd2ce94da4dfacc5a 100644 (file)
--- 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_004';
 
 ##################################################
 
@@ -18,24 +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';
-
-       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'
+       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';
+
+       die $fail if $fail; ## no critic (RequireCarping)
+       scalar slurp 'result' or 'Ok'
 }
 
 1;
@@ -50,13 +57,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