return $retval;
} else {
&ERROR("shmRead: failed: $!");
+ ### TODO: if this fails, never try again.
+ &openSHM();
return '';
}
}
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)) {
}
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.
$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;
+
+ &DEBUG("PID => $forked{$name}{PID}");
+
+ if ( -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 {
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}) {
&ERROR("delForked: forked{$name} does not exist. should not happen.");
}
- &status("fork finished for '$name'.");
+ &status("--- fork finished for '$name' ---");
POSIX::_exit(0);
}