Simplified event handling: only ZEND is significant.

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy.pm

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index fa7606a..a8ba556 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.61 2007-02-21 17:57:59 mike Exp $
+# $Id: IRSpy.pm,v 1.67 2007-02-23 15:01:48 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -364,6 +364,7 @@ sub check {
                    }
                    if (!defined $nextaddr) {
                        $conn->log("irspy", "has no more tests: removing");
+                       ### Does this go wrong if two connections are exhausted?
                        splice @conn, $i0, 1;
                        $this->_rewrite_record($conn);
                        $conn->option(rewrote_record => 1);
@@ -397,42 +398,36 @@ sub check {
                $conn->current_task($task);
                $task->run();
            }
-
-           # Do we need to test $conn->is_idle()?  I don't think so!
        }
 
+      NEXT_EVENT:
        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);
            last;
        }
+
        my $conn = $conn[$i0-1];
        my $ev = $conn->last_event();
        my $evstr = ZOOM::event_str($ev);
        $conn->log("irspy_event", "event $ev ($evstr)");
+       goto NEXT_EVENT if $ev != ZOOM::Event::ZEND;
 
        my $task = $conn->current_task();
        die "$conn has no current task for event $ev ($evstr)" if !$task;
-       eval { $conn->_check() };
-       if ($@ &&
-           ($ev == ZOOM::Event::RECV_DATA ||
-            $ev == ZOOM::Event::ZEND)) {
-           # An error in, say, a search response, becomes visible to
-           # ZOOM before the Receive Data event is sent and persists
-           # until after the End, which means that successive events
-           # each report the same error.  So we just ignore errors on
-           # "unimportant" events.  ### But this doesn't work for,
-           # say, a Connection Refused, as the only event that shows
-           # us this error is the ZEND.
-           $conn->log("irspy_event", "ignoring error ",
-                      "on event $ev ($evstr): $@");
-           next;
-       }
 
        my $res;
+       eval { $conn->_check() };
        if ($@) {
            my $sub = $task->{cb}->{exception};
            die $@ if !defined $sub;
@@ -479,7 +474,7 @@ sub check {
            $conn->log("irspy_test", "test skipped during task $task");
            $conn->current_task(0);
            $conn->next_task(0);
-           # I think that's all we need to do
+           $nskipped++;
 
        } else {
            die "unknown callback return-value '$res'";
@@ -489,11 +484,13 @@ sub check {
     $this->log("irspy", "exiting main loop");
     # Sanity checks: none of the following should ever happen
     my $finished = 1;
-    foreach my $conn (@{ $this->{connections} }) {
+    @conn = @{ $this->{connections} };
+    foreach my $conn (@conn) {
        my $test = $conn->option("current_test_address");
        my $next = $this->_next_test($test);
        if (defined $next) {
-           $this->log("irspy", "$conn (in test '$test') has queued test '$next'");
+           $this->log("irspy",
+                      "$conn (in test '$test') has queued test '$next'");
            $finished = 0;
        }
        if (my $task = $conn->current_task()) {
@@ -505,7 +502,8 @@ sub check {
            $finished = 0;
        }
        if (!$conn->is_idle()) {
-           $this->log("irspy", "$conn still has ZOOM-C level tasks queued: see below");
+           $this->log("irspy",
+                      "$conn still has ZOOM-C level tasks queued: see below");
            $finished = 0;
        }
        my $ev = $conn->peek_event();
@@ -521,9 +519,10 @@ sub check {
     }
 
     # 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).
     if (!$finished) {
-       if (++$nruns < 3) {
+       if (++$nruns < 0) {
            $this->log("irspy", "back into main loop, ${nruns}th time");
            goto ROUND_AND_ROUND_WE_GO;
        } else {
@@ -532,12 +531,12 @@ sub check {
     }
 
     # 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);
-       warn "$conn still has ZOOM-C level task queued: $ev ($evstr)"
+       $this->log("irspy",
+                  "$conn still has ZOOM-C level task queued: $ev ($evstr)")
            if $ev != ZOOM::Event::ZEND;
     }