From cbb6ca99c55e42667a7b7c2e1ab9aedb96e33102 Mon Sep 17 00:00:00 2001
From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Wed, 10 Jan 2001 14:55:07 +0000
Subject: [PATCH] - minor mods to addForked wrt time. - proper detection of
 dead forks.

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@235 c11ca15a-4712-0410-83d8-924469b57eb5
---
 src/Shm.pl | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Shm.pl b/src/Shm.pl
index 27b9519..5fca753 100644
--- a/src/Shm.pl
+++ b/src/Shm.pl
@@ -109,27 +109,30 @@ sub addForked {
     }
 
     if (exists $forked{$name}) {
-	my $time = $forked{$name}{Time};
+	my $time	= $forked{$name}{Time};
+	my $continue	= 0;
+
 	if (-d "/proc/$forked{$name}{PID}") {
 	    &status("fork: still running; good. BAIL OUT.");
 	} else {
-	    &status("fork: lost the fork? REMOVE IT!");
+	    &WARN("Found dead fork; removing and resetting.");
+	    $continue = 1;
 	}
 
-	if (time() - $time > 900) {	# stale fork > 15m.
+	if ($continue) {
+	    # NOTHING.
+	} elsif (time() - $time > 900) {	# stale fork > 15m.
 	    &status("forked: forked{$name} presumably exited without notifying us.");
-	    $forked{$name}{Time} = 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}	= time();
-	$forkedtime		= time();
-	$count{'Fork'}++;
-	return 1;
     }
+
+    $forked{$name}{Time}	= time();
+    $forkedtime			= time();
+    $count{'Fork'}++;
+    return 1;
 }
 
 sub delForked {
@@ -152,7 +155,7 @@ sub delForked {
 	&ERROR("delForked: forked{$name} does not exist. should not happen.");
     }
 
-    &status("fork finished for '$name'.");
+    &status("--- fork finished for '$name' ---");
 
     POSIX::_exit(0);
 }
-- 
2.39.5