Changeset 274

Timestamp:

11/22/06 03:20:29 (6 years ago)

Author:

lincoln

Message:

enforce max_runtime of components

Files:

• engines/dog (modified) (4 diffs)
• status (modified) (1 diff)

engines/dog

@@ -3 +3 @@
 my $myprogname = 'dog';
 my $progname = 'shepherd';
-my $version = '0.3.10';
+my $version = '0.3.11';
 
 # 'dog'
@@ -250 +250 @@
             printf "SHEPHERD: Excuting command: $comm\n";
             chdir "$CWD/grabbers/$grabber/";
-            $retval = call_prog($comm);
+            $retval = call_prog($comm,(query_config($grabber,'max_runtime')*60));
             chdir $CWD;
         }
@@ -1387 +1387 @@
     my $dir = sprintf "%s/%ss/%s/",$CWD,$data_processor_type,$data_processor_name;
     chdir $dir;
-    my $retval = call_prog($comm);
+    my $retval = call_prog($comm,(query_config($grabber,'max_runtime')*60));
     chdir $CWD;
 
@@ -1584 +1584 @@
 sub call_prog
 {
-    my $prog = shift;
+    my ($prog,$timeout) = @_;
+    $timeout = 0 if (!defined $timeout);
+
     if (!(open(PROG,"$prog|"))) {
         printf "warning: couldn't exec \"$prog\": $!\n";
         return -1;
     }
-    while(<PROG>) {
-        print $_;
-    }
-    close(PROG);
+
+    eval {
+        local $SIG{ALRM};
+        if ($timeout > 0) {
+            $SIG{ALRM} = sub { die "alarm\n" };
+            alarm $timeout; # set alarm
+        }
+        while(<PROG>) {
+            print $_;
+        }
+        alarm(0) if ($timeout > 0); # cancel alarm
+        close(PROG);
+    };
+    if ($@) {
+        die unless $@ eq "alarm\n";   # propagate unexpected errors
+
+        # timeout
+        printf "prog ran for $timeout seconds, stopping it.\n";
+        close(PROG);
+    }
 
     if ($? == -1) {

status

@@ -1 +1 @@
 application     shepherd            0.3.22
-engine          dog                 0.3.10
+engine          dog                 0.3.11
 grabber         yahoo7widget        1.58-r1
 grabber         rex                 3.3.7