X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FShm.pl;h=0484ff2e2c34e2f2a2021443bf4d2a6e8e3f714e;hb=3f48414ab1bef68209a7edcfea486d412c2f17dc;hp=27b95198e02ba6f2ef39fd92ca5440db7c4d9abf;hpb=8934852e63f594aeb55619214087e9541fc83375;p=infobot.git diff --git a/src/Shm.pl b/src/Shm.pl index 27b9519..0484ff2 100644 --- a/src/Shm.pl +++ b/src/Shm.pl @@ -5,16 +5,27 @@ # Created: 20000124 # -if (&IsParam("useStrict")) { use strict; } +# use strict; # TODO use POSIX qw(_exit); +my %shm_keys; + 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: [$_]"); + $shm_keys{$_} = {time => time, + accessed => 0, + key => $_, + }; return $_; } else { &ERROR("openSHM: failed."); @@ -40,10 +51,19 @@ 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: $!"); + if (exists $shm_keys{$_}) { + closeSHM($key); + } + ### TODO: if this fails, never try again. + # What use is opening a SHM segment if we're not going to read it? + # &openSHM(); return ''; } } @@ -53,15 +73,34 @@ 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; - $str = $read ."||". $str if ($read ne ""); + return if (&IsParam('noSHM')); + + $shm_keys{$keys}{accessed} = 1; + + 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: $!"); } } @@ -83,53 +122,90 @@ 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; - 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. 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; } $count++; } - if (exists $forked{$name}) { - my $time = $forked{$name}{Time}; - if (-d "/proc/$forked{$name}{PID}") { + 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; + + $continue++ if ($forked{$name}{PID} == $$); + + if ($continue) { + &WARN("hrm.. fork pid == mypid == $$; how did this happen?"); + + } elsif ( -d "/proc/$forked{$name}{PID}") { &status("fork: still running; good. BAIL OUT."); + return 0; + } 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(); + $forked{$name}{PID} = $$; + $forkedtime = time(); + $count{'Fork'}++; + return 1; } sub delForked { @@ -142,6 +218,10 @@ sub delForked { 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}) { @@ -152,9 +232,61 @@ 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); } +sub shmFlush { + return if ($$ != $::bot_pid); # fork protection. + + if (@_) { + &ScheduleThis(15*60, 'shmFlush'); # 15 minutes + 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; + +# vim:ts=4:sw=4:expandtab:tw=80