X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fbin%2Fbomb.pl;h=7e9ab0aff6e63ff412a2b52b9c343dad53429939;hb=a914309eea04e44fe857d2b36728bfe90d8f63a9;hp=95e7dd5995779b14b036ba2883fe74e0765db7b0;hpb=2a01aaae072eb38bcb560d9b8c09e8c8ea4d7af6;p=mkws-moved-to-github.git

diff --git a/test/bin/bomb.pl b/test/bin/bomb.pl
index 95e7dd5..7e9ab0a 100755
--- a/test/bin/bomb.pl
+++ b/test/bin/bomb.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright (c) 2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2014 Index Data ApS. http://indexdata.com
 #
 # bomb.pl - wrapper to stop a process after N seconds
 #
@@ -38,30 +38,38 @@ my @system = @ARGV;
 die usage if $help;
 die usage if !@system;
 
-# set CPU limit, in case the alarm handler will
-# be ignored
-eval {
-    require BSD::Resource;
-    BSD::Resource::setrlimit("RLIMIT_CPU", $timeout, 2*$timeout) or die "Cannot set CPU limit: $!\n";
-};
-if ($@) {
-    warn "WARNING: things would go more nicely with the BSD::Resource package\n";
-}
-
+# disabled - we set the CPU limit in the wrapper ./bomb
+## set CPU limit, in case the alarm handler will
+## be ignored
+#eval {
+#    require BSD::Resource;
+#    BSD::Resource::setrlimit( "RLIMIT_CPU", $timeout, 2 * $timeout )
+#      or die "Cannot set CPU limit: $!\n";
+#};
+#if ($@) {
+#    warn
+#      "WARNING: things would go more nicely with the BSD::Resource package\n";
+#}
 
 #
-# use fork/exec instead system()
+# configure signal handlers
 #
-$pid = fork();
-die "fork() failed: $!" unless defined $pid;
+$SIG{ALRM} = sub {
+    my $pgid = getpgrp();
 
-# child
-if ($pid) {
-    alarm($timeout);
-    exec(@system) or die "exec @system: $!\n";
-}
+    warn "Alarm handler got called after $timeout seconds\n";
+    warn "Kill now the process group $pgid\n\n";
+
+    # kill process group
+    kill "INT", -$pgid;
+};
+
+# don't kill ourself
+$SIG{INT} = "IGNORE";
+
+alarm($timeout);
 
-# parent
-else { }
+system(@system) == 0
+  or die "system('@system') failed: ?='$?', !='$!', ^E='$^E'\n";
 
 1;