Start gruntmaster-exec alarm just before exec

[gruntmaster-daemon.git] / gruntmaster-exec

diff --git a/gruntmaster-exec b/gruntmaster-exec
index 6d5381257b83e85e5910494dcfec4691e6c3061a..fd79d8f316c322c9008f14bbe98b402772011c77 100755 (executable)
--- a/gruntmaster-exec
+++ b/gruntmaster-exec
@@ -46,7 +46,13 @@ undef $mlimit if @sudo; # sudo wants a lot of address space
 
 my $ret = fork // die 'Cannot fork';
 if ($ret) {
-       my $tle;
+       my ($tle, $child_ready);
+       local $SIG{USR1} = sub { $child_ready = 1 };
+       sleep 3; # Wait for ready signal (SIGUSR1)
+       unless ($child_ready) {
+               kill KILL => $ret;
+               exit !say ERR, "\nNo response from gruntmaster-exec child";
+       }
        local $SIG{ALRM} = sub {
                if ($killuser) {
                        system @sudo, 'pkill', '-KILL', '-u', $killuser;
@@ -66,7 +72,7 @@ if ($ret) {
        my $signame = sig_name $sig;
        exit !say TLE,  "\nTime Limit Exceeded"   if $tle;
        exit !say OLE,  "\nOutput Limit Exceeded" if $sig && $signame eq 'XFSZ';
-       exit !say DIED, "\nCrash (SIG$signame)"   if $sig && ($signame ne 'PIPE' || $ARGV[0] =~ /prog/);
+       exit !say DIED, "\nCrash (SIG$signame)"   if $sig && ($signame ne 'PIPE' || $ARGV[0] !~ /prog/);
        exit !say NZX,  "\nNon-zero exit status: " . ($? >> 8) if $? >> 8;
        exit !say AC,   "\nAll OK";
 } else {
@@ -92,6 +98,7 @@ if ($ret) {
        print $adj 900;
        close $adj;
        unshift @ARGV, @sudo;
+       kill USR1 => getppid; # Tell parent process that we're ready
        say STDERR "Executing: ", join ' ', map { "'$_'" } @ARGV if $debug;
        exec @ARGV;
 }