- forgot to set forked{}{PID} in addForked

[infobot.git] / src / Shm.pl

diff --git a/src/Shm.pl b/src/Shm.pl
index e4d037a9c5812e5a872d9bc99012eb937caedd82..8d6e5a3882564f546d96305ae0dd80e2bc9827a9 100644 (file)
--- a/src/Shm.pl
+++ b/src/Shm.pl
@@ -1,12 +1,14 @@
 #
 #   Shm.pl: Shared Memory stuff.
-#    Author: xk <xk@leguin.openprojects.net>
+#    Author: dms
 #   Version: 20000201
 #   Created: 20000124
 #
 
 if (&IsParam("useStrict")) { use strict; }
 
+use POSIX qw(_exit);
+
 sub openSHM {
     my $IPC_PRIVATE = 0;
     my $size = 2000;
@@ -25,6 +27,9 @@ sub closeSHM {
     my ($key) = @_;
     my $IPC_RMID = 0;
 
+    return '' if (!defined $key);
+
+    &shmFlush();
     &status("Closed shared memory (shm) key: [$key]");
     return shmctl($key, $IPC_RMID, 0);
 }
@@ -39,6 +44,8 @@ sub shmRead {
        return $retval;
     } else {
        &ERROR("shmRead: failed: $!");
+       ### TODO: if this fails, never try again.
+       &openSHM();
        return '';
     }
 }
@@ -53,7 +60,14 @@ sub shmWrite {
     if ($str !~ /^$/) {
        my $read = &shmRead($key);
        $read =~ s/\0+//g;
-       $str = $read ."||". $str if ($read ne "");
+
+       if ($str eq "") {
+           $str = time().": ";         # time stamping, null.
+       } elsif ($read eq "") {
+           $str = time().": ";         # timestamping.
+       } else {
+           $str = $read ."||". $str;
+       }
     }
 
     if (!shmwrite($key,$str,$position,$size)) {
@@ -61,18 +75,24 @@ sub shmWrite {
     }
 }
 
-#######
-# Helpers
-#
+##############
+### Helpers
+###
 
 # Usage: &addForked($name);
 # Return: 1 for success, 0 for failure.
 sub addForked {
-    my ($name) = @_;
+    my ($name)         = @_;
     my $forker_timeout = 360;  # 6mins, in seconds.
+    $forker            = $name;
+
+    if (!defined $name) {
+       &WARN("addForked: name == NULL.");
+       return 0;
+    }
 
     foreach (keys %forked) {
-       my $time = time() - $forked{$_};
+       my $time = time() - $forked{$_}{Time};
        next unless ($time > $forker_timeout);
 
        ### TODO: use &time2string()?
@@ -81,7 +101,7 @@ sub addForked {
     }
 
     my $count = 0;
-    while (scalar keys %forked > 2) {  # 2 or more == fail.
+    while (scalar keys %forked > 1) {  # 2 or more == fail.
        sleep 1;
 
        if ($count > 3) {       # 3 seconds.
@@ -97,35 +117,69 @@ sub addForked {
        $count++;
     }
 
-    if (exists $forked{$name}) {
-       my $time = $forked{$name};
-       if (time() - $forked{$name} > 900) {    # stale fork > 15m.
+    if (exists $forked{$name} and !scalar keys %{ $forked{$name} }) {
+       &WARN("addF: forked{$name} exists but is empty; deleting.");
+       undef $forked{$name};
+    }
+
+    if (exists $forked{$name} and scalar keys %{ $forked{$name} }) {
+       my $time        = $forked{$name}{Time};
+       my $continue    = 0;
+
+       &DEBUG("PID => $forked{$name}{PID}");
+
+       if ( -d "/proc/$forked{$name}{PID}") {
+           &status("fork: still running; good. BAIL OUT.");
+           return 0;
+       } else {
+           &WARN("Found dead fork; removing and resetting.");
+           $continue = 1;
+       }
+
+       if ($continue) {
+           # NOTHING.
+       } elsif (time() - $time > 900) {        # stale fork > 15m.
            &status("forked: forked{$name} presumably exited without notifying us.");
-           $forked{$name} = time();
-           return 1;
        } else {                                # fresh fork.
-           &msg($who, "$name is already running ". &Time2String(time() - $forked{$name}));
+           &msg($who, "$name is already running ". &Time2String(time() - $time));
            return 0;
        }
-    } else {
-       $forked{$name} = time();
-       $count{'Fork'}++;
-       return 1;
     }
+
+    $forked{$name}{Time}       = time();
+    $forked{$name}{PID}                = $$;
+    $forkedtime                        = time();
+    $count{'Fork'}++;
+    return 1;
 }
 
 sub delForked {
-    my ($name) = @_;
+    my ($name) = @_;
+
+    return if ($$ == $bot_pid);
+
+    if (!defined $name) {
+       &WARN("delForked: name == NULL.");
+       POSIX::_exit(0);
+    }
+
+    if ($name =~ /\.pl/) {
+       &WARN("dF: name is name of source file ($name). FIX IT!");
+    }
+
+    &showProc();       # just for informational purposes.
 
     if (exists $forked{$name}) {
-       my $timestr = &Time2String(time() - $forked{$name});
+       my $timestr = &Time2String(time() - $forked{$name}{Time});
        &status("fork: took $timestr for $name.");
        &shmWrite($shm,"DELETE FORK $name");
-       return 1;
     } else {
        &ERROR("delForked: forked{$name} does not exist. should not happen.");
-       return 0;
     }
+
+    &status("--- fork finished for '$name' ---");
+
+    POSIX::_exit(0);
 }
 
 1;