Rename the --nobody argument to --sudo

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

diff --git a/lib/Gruntmaster/Daemon/Format.pm b/lib/Gruntmaster/Daemon/Format.pm
index 93035ddc9d8c1337d4919578e0b2616f955ae07e..227b14149a2ae8a72d1d58404a2648cd3b07101d 100644 (file)
--- a/lib/Gruntmaster/Daemon/Format.pm
+++ b/lib/Gruntmaster/Daemon/Format.pm
@@ -6,48 +6,63 @@ use warnings;
 use parent qw/Exporter/;
 no if $] > 5.017011, warnings => 'experimental::smartmatch';
 
-use POSIX qw//;
+use Expect::Simple;
 use File::Basename qw/fileparse/;
 use File::Slurp qw/read_file write_file/;
-use Gruntmaster::Daemon::Constants qw/TLE OLE DIED NZX/;
-use Time::HiRes qw/alarm/;
 use List::MoreUtils qw/natatime/;
 use Log::Log4perl qw/get_logger/;
-use IPC::Signal qw/sig_name sig_num/;
+use POSIX qw/mkfifo/;
+use String::ShellQuote qw/shell_quote/;
 use Try::Tiny;
 
-our $VERSION = "5999.000_004";
-our @EXPORT_OK = qw/prepare_files/;
+our $VERSION = '5999.000_004';
+our @EXPORT_OK = qw/prepare_files stopvms/;
 
 ##################################################
 
-sub execlist {
-       my (@args) = @_;
-       my $ret = fork // die 'Cannot fork';
-       if ($ret) {
-               waitpid $ret, 0;
-               die "gruntmaster-exec died\n" if -z 'exec-result';
-               my ($excode, $exmsg) = read_file 'exec-result';
-               unlink 'exec-result';
-               chomp ($excode, $exmsg);
-               die [$excode, $exmsg] if $excode > 0;
-       } else {
-               open STDOUT, '>exec-result';
-               exec 'gruntmaster-exec', @args;
-       }
+our (%vm);
+
+sub runvm {
+       my ($name) = @_;
+       return unless $ENV{GRUNTMASTER_VM};
+       mkfifo "$name.in", 0600;
+       mkfifo "$name.out", 0600;
+       get_logger->trace("Starting VM $name");
+       $vm{$name} = Expect::Simple->new({
+               Cmd => "$ENV{GRUNTMASTER_VM} $name",
+               Prompt => '# ',
+               DisconnectCmd => 'exit',
+               RawPty => 1,
+               Timeout => 10,
+       });
 }
 
-sub command_and_args{
-       my ($format, $basename) = @_;
+sub stopvms { %vm = () }
 
-       given($format) {
-               "./$basename" when [qw/C CPP GCCGO GOLANG HASKELL PASCAL/];
-               "./$basename.exe" when 'MONO';
-               java => $basename when 'JAVA';
-               perl => $basename when 'PERL';
-               python => $basename when 'PYTHON';
-               default { die "Don't know how to execute format $format\n" }
+sub execlist {
+       my ($vm, @args) = @_;
+       my $er = "exec-result-$vm";
+       if ($vm{$vm}) {
+               my $cmd = ">$er " . shell_quote 'gruntmaster-exec', @args;
+               get_logger->trace("Running in VM $vm: $cmd");
+               $vm{$vm}->send($cmd);
+       } else {
+               my $ret = fork // die "Cannot fork\n";
+               if ($ret) {
+                       waitpid $ret, 0;
+               } else {
+                       open STDOUT, '>', $er or die "Cannot open $er\n";
+                       get_logger->trace("Running: gruntmaster-exec @args");
+                       exec 'gruntmaster-exec', @args;
+               }
        }
+
+       die "gruntmaster-exec died\n" if -z $er;
+       my ($excode, $exmsg) = read_file $er;
+       unlink $er;
+       chomp ($excode, $exmsg); ## no critic (ProhibitParensWithBuiltins)
+       get_logger->trace("Exec result: $excode $exmsg");
+       die [$excode, $exmsg] if $excode > 0; ## no critic (RequireCarping)
 }
 
 sub mkrun{
@@ -56,8 +71,9 @@ sub mkrun{
                local *__ANON__ = 'mkrun_runner';
                my ($name, %args) = @_;
                get_logger->trace("Running $name...");
-               my $basename = fileparse $name, qr/\.[^.]*/;
-               my @args;
+               my $basename = fileparse $name, qr/[.][^.]*/s;
+               my @args = ('--sudo');
+               push @args, '--no-close' if $ENV{TEST_VERBOSE};
                push @args, '--timeout', $args{timeout} if $args{timeout};
                push @args, '--mlimit',  $args{mlimit}  if $args{mlimit};
                push @args, '--olimit',  $args{olimit}  if $args{olimit};
@@ -66,7 +82,7 @@ sub mkrun{
                while (my ($fd, $file) = $it->()) {
                        push @args, "--fd=$fd $file";
                }
-               execlist @args, command_and_args($format, $basename);
+               execlist $basename, @args, '--', "./$basename", @{$args{args}}
        }
 }
 
@@ -75,18 +91,20 @@ sub prepare{
        get_logger->trace("Preparing file $name...");
 
        try {
-               execlist '--fd=1 >>errors', '--fd=2 >>errors', 'gruntmaster-compile', $format, $name;
+               execlist prog => '--fd=1 >>errors', '--fd=2 >>errors', 'gruntmaster-compile', $format, $name;
        } catch {
-               die "Compile error\n"
+               my $exmsg = $_->[1];
+               die "Compile error ($exmsg)\n"
        } finally {
                $Gruntmaster::Daemon::errors .= read_file 'errors';
-               $Gruntmaster::Daemon::errors .= "\n";
+               $Gruntmaster::Daemon::errors .= "\n" if -s 'errors';
                unlink 'errors';
        };
 }
 
 sub prepare_files{
        my $meta = shift;
+       runvm $_ for keys %{$meta->{files}};
 
        for my $file (values %{$meta->{files}}) {
                my ($format, $name, $content) = @{$file}{qw/format name content/};