X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon%2FRunner%2FInteractive.pm;h=66493cfdb5af0f7e76be1fb36d784c6ca5800d38;hp=aea381a4bdfab70f76c33a11b3ea9ee98c077840;hb=967faabc4dd9e926a4c5bc316844b7033d744c69;hpb=8aec2ffe6e3b488974f2ca97f7d63324e47742ab diff --git a/lib/Gruntmaster/Daemon/Runner/Interactive.pm b/lib/Gruntmaster/Daemon/Runner/Interactive.pm index aea381a..66493cf 100644 --- a/lib/Gruntmaster/Daemon/Runner/Interactive.pm +++ b/lib/Gruntmaster/Daemon/Runner/Interactive.pm @@ -10,32 +10,32 @@ 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]); + } catch { + exit 1; + }; + exit + } + + scalar slurp 'result' } 1;