X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=test%2Fbin%2Fbomb.pl;h=2dde3d48f37ec1012e98d627f01f2c1db5da628f;hp=4ce8590da78fd80565097e8d244eaebda7e727a5;hb=e037fab727a9eb80c33f1693fcd6d0b67b84da32;hpb=b0dabcd2993438c7326c44ee76da8c6bf67e8a37

diff --git a/test/bin/bomb.pl b/test/bin/bomb.pl
index 4ce8590..2dde3d4 100755
--- a/test/bin/bomb.pl
+++ b/test/bin/bomb.pl
@@ -1,12 +1,11 @@
 #!/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
 #
 
 use Getopt::Long;
 use POSIX ":sys_wait_h";
-use BSD::Resource qw/setrlimit/;
 
 use strict;
 use warnings;
@@ -39,23 +38,39 @@ my @system = @ARGV;
 die usage if $help;
 die usage if !@system;
 
-# set CPU limit, in case the alarm handler will
-# be ignored
-setrlimit(RLIMIT_CPU, $timeout, 2*$timeout) or die "Cannot set CPU limit: $!\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";
+    warn "Command: @system\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: ?='$?', !='$!'\n";
 
 1;