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 ed9a056f2aac09e5907a35f15a18d4b3c336f98a..da51380200c0addf58ae8c9bd2ce94da4dfacc5a 100644 (file)
--- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm
+++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm
@@ -21,30 +21,27 @@ sub run{
        mkfifo 'fifo1', 0600 or die "$!\n" unless -e 'fifo1';
        mkfifo 'fifo2', 0600 or die "$!\n" unless -e 'fifo2';
 
        mkfifo 'fifo1', 0600 or die "$!\n" unless -e 'fifo1';
        mkfifo 'fifo2', 0600 or die "$!\n" unless -e 'fifo2';
 

-       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 { $_ => $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 { $_ => $meta->{$_} } qw/timeout mlimit/);
-               } catch {
-                       exit 1;
-               };
-               exit
-       }
+       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';
 
 
        unlink 'fifo1';
        unlink 'fifo2';
 

+       die $fail if $fail; ## no critic (RequireCarping)

        scalar slurp 'result' or 'Ok'
 }
 
        scalar slurp 'result' or 'Ok'
 }