summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
34fd524)
(too many connections), which was the cause of the busy-loop
failure when testing all targets.
Final play-out of left-over events also avoids busy looping on
unexpected negative return-value.
Do not re-enter main loop after initial exit.
-# $Id: IRSpy.pm,v 1.61 2007-02-21 17:57:59 mike Exp $
+# $Id: IRSpy.pm,v 1.62 2007-02-22 11:51:58 mike Exp $
my $i0 = ZOOM::event(\@conn);
$this->log("irspy_event",
"ZOOM_event(", scalar(@conn), " connections) = $i0");
my $i0 = ZOOM::event(\@conn);
$this->log("irspy_event",
"ZOOM_event(", scalar(@conn), " connections) = $i0");
- if ($i0 == -3 || $i0 == 0) {
- # no connections left, or no events on those that remain
- $this->log("irspy", "no events remain");
+ if ($i0 < 1) {
+ my %messages = (
+ 0 => "no events remain",
+ -1 => "ZOOM::event() argument not a reference",
+ -2 => "ZOOM::event() reference not an array",
+ -3 => "no connections remain",
+ -4 => "too many connections for ZOOM::event()",
+ );
+ my $message = $messages{$i0} || "ZOOM::event() returned $i0";
+ $this->log("irspy", $message);
my $conn = $conn[$i0-1];
my $ev = $conn->last_event();
my $evstr = ZOOM::event_str($ev);
my $conn = $conn[$i0-1];
my $ev = $conn->last_event();
my $evstr = ZOOM::event_str($ev);
}
# This really shouldn't be necessary, and in practice it rarely
}
# This really shouldn't be necessary, and in practice it rarely
- # helps, but it's belt and braces
+ # helps, but it's belt and braces. For now, we don't do this
+ # (hence the zero in the $nruns check).
$this->log("irspy", "back into main loop, ${nruns}th time");
goto ROUND_AND_ROUND_WE_GO;
} else {
$this->log("irspy", "back into main loop, ${nruns}th time");
goto ROUND_AND_ROUND_WE_GO;
} else {
# This shouldn't happen emit anything either:
@conn = @{ $this->{connections} };
# This shouldn't happen emit anything either:
@conn = @{ $this->{connections} };
- while (my $i1 = ZOOM::event(\@conn)) {
+ while ((my $i1 = ZOOM::event(\@conn)) > 0) {
my $conn = $conn[$i1-1];
my $ev = $conn->last_event();
my $evstr = ZOOM::event_str($ev);
my $conn = $conn[$i1-1];
my $ev = $conn->last_event();
my $evstr = ZOOM::event_str($ev);