X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FShm.pl;h=cebe4dc59b2b8c9a7142c8b4a7761c4207ee5cfc;hb=1926520ab4d05a779e2b66ef0a4272861186783f;hp=8d6e5a3882564f546d96305ae0dd80e2bc9827a9;hpb=85491c5800564e365f7f5bd5cb791863ce6170eb;p=infobot.git

diff --git a/src/Shm.pl b/src/Shm.pl
index 8d6e5a3..cebe4dc 100644
--- a/src/Shm.pl
+++ b/src/Shm.pl
@@ -5,7 +5,7 @@
 #   Created: 20000124
 #
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;	# TODO
 
 use POSIX qw(_exit);
 
@@ -13,6 +13,11 @@ sub openSHM {
     my $IPC_PRIVATE = 0;
     my $size = 2000;
 
+    if (&IsParam("noSHM")) {
+	&status("Shared memory: Disabled. WARNING: bot may become unreliable");
+	return 0;
+    }
+
     if (defined( $_ = shmget($IPC_PRIVATE, $size, 0777) )) {
 	&status("Created shared memory (shm) key: [$_]");
 	return $_;
@@ -40,7 +45,10 @@ sub shmRead {
     my $size = 3*80;
     my $retval = '';
 
+    return '' if (&IsParam("noSHM"));
+
     if (shmread($key,$retval,$position,$size)) {
+	#&DEBUG("shmRead($key): $retval");
 	return $retval;
     } else {
 	&ERROR("shmRead: failed: $!");
@@ -55,22 +63,32 @@ sub shmWrite {
     my $position = 0;
     my $size = 80*3;
 
-    # NULL hack.
-    ### TODO: create shmClear to deal with this.
-    if ($str !~ /^$/) {
-	my $read = &shmRead($key);
-	$read =~ s/\0+//g;
+    return if (&IsParam("noSHM"));
 
-	if ($str eq "") {
-	    $str = time().": ";		# time stamping, null.
-	} elsif ($read eq "") {
-	    $str = time().": ";		# timestamping.
-	} else {
-	    $str = $read ."||". $str;
+    if (length($str) > $size) {
+	&status("ERROR: length(str) (..)>$size...");
+	return;
+    }
+
+    if (length($str) == 0) {
+	# does $size overwrite the whole lot?
+	# if not, set to 2000.
+	if (!shmwrite($key, '', $position, $size)) {
+	    &ERROR("shmWrite: failed: $!");
 	}
+	return;
+    }
+
+    my $read = &shmRead($key);
+    $read =~ s/\0+//g;
+    if ($read eq "") {
+	$str = sprintf("%s:%d:%d: ", $param{ircUser}, $bot_pid, time());
+    } else {
+	$str = $read ."||". $str;
     }
 
-    if (!shmwrite($key,$str,$position,$size)) {
+    if (!shmwrite($key, $str, $position, $size)) {
+	&DEBUG("shmWrite($key, $str)");
 	&ERROR("shmWrite: failed: $!");
     }
 }
@@ -92,12 +110,30 @@ sub addForked {
     }
 
     foreach (keys %forked) {
-	my $time = time() - $forked{$_}{Time};
+	my $n = $_;
+	my $time = time() - $forked{$n}{Time};
 	next unless ($time > $forker_timeout);
 
 	### TODO: use &time2string()?
-	&WARN("Fork: looks like we lost '$_', executed $time ago.");
-	delete $forked{$_};
+	&WARN("Fork: looks like we lost '$n', executed $time ago");
+
+	my $pid = $forked{$n}{PID};
+	if (!defined $pid) {
+	    &WARN("Fork: no pid for $n.");
+	    delete $forked{$n};
+	    next;
+	}
+
+	if ($pid == $bot_pid) {
+	    # don't kill parent, just warn.
+	    &status("Fork: pid == \$bot_pid == \$\$ ($bot_pid)");
+
+	} elsif ( -d "/proc/$pid") {	# pid != bot_pid.
+	    &status("Fork: killing $name ($pid)");
+	    kill 9, $pid;
+	}
+
+	delete $forked{$n};
     }
 
     my $count = 0;
@@ -107,10 +143,11 @@ sub addForked {
 	if ($count > 3) {	# 3 seconds.
 	    my $list = join(', ', keys %forked);
 	    if (defined $who) {
-		&msg($who, "already running ($list) => exceeded allowed forked processes count (1?).");
+		&msg($who, "exceeded allowed forked count (shm $shm): $list");
 	    } else {
-		&status("Fork: I ran too many forked processes :) Giving up $name.");
+		&status("Fork: I ran too many forked processes :) Giving up $name. Shm: $shm");
 	    }
+
 	    return 0;
 	}
 
@@ -126,11 +163,15 @@ sub addForked {
 	my $time	= $forked{$name}{Time};
 	my $continue	= 0;
 
-	&DEBUG("PID => $forked{$name}{PID}");
+	$continue++ if ($forked{$name}{PID} == $$);
+
+	if ($continue) {
+	    &WARN("hrm.. fork pid == mypid == $$; how did this happen?");
 
-	if ( -d "/proc/$forked{$name}{PID}") {
+	} elsif ( -d "/proc/$forked{$name}{PID}") {
 	    &status("fork: still running; good. BAIL OUT.");
 	    return 0;
+
 	} else {
 	    &WARN("Found dead fork; removing and resetting.");
 	    $continue = 1;
@@ -138,8 +179,10 @@ sub addForked {
 
 	if ($continue) {
 	    # NOTHING.
+
 	} elsif (time() - $time > 900) {	# stale fork > 15m.
 	    &status("forked: forked{$name} presumably exited without notifying us.");
+
 	} else {				# fresh fork.
 	    &msg($who, "$name is already running ". &Time2String(time() - $time));
 	    return 0;
@@ -182,4 +225,54 @@ sub delForked {
     POSIX::_exit(0);
 }
 
+sub shmFlush {
+    return if ($$ != $::bot_pid); # fork protection.
+
+    if (@_) {
+	&ScheduleThis(15, "shmFlush");
+	return if ($_[0] eq "2");
+    }
+
+    my $time;
+    my $shmmsg = &shmRead($shm);
+    # remove padded \0's.
+    $shmmsg =~ s/\0//g;
+    return if (length($shmmsg) == 0);
+    if ($shmmsg =~ s/^(\S+):(\d+):(\d+): //) {
+	my $n	= $1;
+	my $pid	= $2;
+	$time	= $3;
+    } else {
+	&status("warn: shmmsg='$shmmsg'.");
+	return;
+    }
+
+    foreach (split '\|\|', $shmmsg) {
+	next if (/^$/);
+	&VERB("shm: Processing '$_'.",2);
+
+	if (/^DCC SEND (\S+) (\S+)$/) {
+	    my ($nick,$file) = ($1,$2);
+	    if (exists $dcc{'SEND'}{$who}) {
+		&msg($nick, "DCC already active.");
+	    } else {
+		&DEBUG("shm: dcc sending $2 to $1.");
+		$conn->new_send($1,$2);
+		$dcc{'SEND'}{$who} = time();
+	    }
+	} elsif (/^SET FORKPID (\S+) (\S+)/) {
+	    $forked{$1}{PID} = $2;
+	} elsif (/^DELETE FORK (\S+)$/) {
+	    delete $forked{$1};
+	} elsif (/^EVAL (.*)$/) {
+	    &DEBUG("evaling '$1'.");
+	    eval $1;
+	} else {
+	    &DEBUG("shm: unknown msg. ($_)");
+	}
+    }
+
+    &shmWrite($shm,"") if ($shmmsg ne "");
+}
+
 1;