Add perlcritic test and make code comply

[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 ec07aebd1c8cc2a76cc869d685cb32c59c18be20..dfdf95b5982e93c4a540c555e1690f80db91c97e 100644 (file)
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -10,32 +10,47 @@ use Log::Log4perl qw/get_logger/;
 use POSIX qw/mkfifo/;
 use Try::Tiny;
 
-our $VERSION = '5999.000_002';
+our $VERSION = '5999.000_004';
 
 ##################################################
 
 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 "$!\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'
 }
 
 1;
@@ -50,13 +65,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