Merge pull request #111 from unhammer/extract-perl-safewait

die if the forked extract exited with error

1 files changed, 24 insertions, 2 deletions

diff --git a/scripts/generic/extract-parallel.perl b/scripts/generic/extract-parallel.perl
index 2b2b4333d..ebfe6639a 100755
--- a/scripts/generic/extract-parallel.perl
+++ b/scripts/generic/extract-parallel.perl
@@ -150,9 +150,8 @@ for (my $i = 0; $i < $numParallel; ++$i)
     print "glueArg=$glueArg \n";
 
     my $cmd = "$extractCmd $TMPDIR/target.$numStr $TMPDIR/source.$numStr $TMPDIR/align.$numStr $TMPDIR/extract.$numStr $glueArg $otherExtractArgs $weightsCmd --SentenceOffset ".($i*$linesPerSplit)." 2>> /dev/stderr \n";
-    print STDERR $cmd;
-    `$cmd`;
 
+    safesystem($cmd) or die;
     exit();
   }
   else
@@ -164,6 +163,10 @@ for (my $i = 0; $i < $numParallel; ++$i)
 # wait for everything is finished
 foreach (@children) {
 	waitpid($_, 0);
+        if($? != 0) {
+                print STDERR "ERROR: Failed to execute: @_\n  $!\n";
+                exit(1);
+        }
 }
 
 # merge
@@ -326,3 +329,22 @@ sub NumStr($)
     return $numStr;
 }
 
+sub safesystem {
+  print STDERR "Executing: @_\n";
+  system(@_);
+  if ($? == -1) {
+      print STDERR "ERROR: Failed to execute: @_\n  $!\n";
+      exit(1);
+  }
+  elsif ($? & 127) {
+      printf STDERR "ERROR: Execution of: @_\n  died with signal %d, %s coredump\n",
+          ($? & 127),  ($? & 128) ? 'with' : 'without';
+      exit(1);
+  }
+  else {
+    my $exitcode = $? >> 8;
+    print STDERR "Exit code: $exitcode\n" if $exitcode;
+    return ! $exitcode;
+  }
+}
+