Lightly tweak sample command-line to make it more amenable to running under perldb...

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

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index ebd3aae..fa0885c 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.54 2006-12-14 17:24:29 mike Exp $
+# $Id: IRSpy.pm,v 1.58 2007-02-05 13:28:51 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -248,15 +248,22 @@ sub _render_record {
 sub _irspy_to_zeerex {
     my ($this, $conn) = @_;
     my $irspy_doc = $conn->record()->{zeerex}->ownerDocument;
-    #open FH, '>/tmp/irspy_orig.xml';
-    #print FH $irspy_doc->toString();
-    #close FH;
+    my $save_xml = 0;
+
+    if ($save_xml) {
+       unlink('/tmp/irspy_orig.xml');
+       open FH, '>/tmp/irspy_orig.xml';
+       print FH $irspy_doc->toString();
+       close FH;
+    }
     my %params = ();
     my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params);
-
-    #open FH, '>/tmp/irspy_transformed.xml';
-    #print FH $result->toString();
-    #close FH;
+    if ($save_xml) {
+       unlink('/tmp/irspy_transformed.xml');
+       open FH, '>/tmp/irspy_transformed.xml';
+       print FH $result->toString();
+       close FH;
+    }
 
     return $result->documentElement();
 }
@@ -334,6 +341,8 @@ sub check {
 
     my @conn = @{ $this->{connections} };
 
+    my $nruns = 0;
+  ROUND_AND_ROUND_WE_GO:
     while (1) {
        my @copy_conn = @conn;  # avoid alias problems after splice()
        my $nconn = scalar(@copy_conn);
@@ -395,7 +404,11 @@ sub check {
        my $i0 = ZOOM::event(\@conn);
        $this->log("irspy_event",
                   "ZOOM_event(", scalar(@conn), " connections) = $i0");
-       last if $i0 == 0 || $i0 == -3; # no events or no connections
+       if ($i0 == -3 || $i0 == 0) {
+           # no connections left, or no events on those that remain
+           $this->log("irspy", "no events remain");
+           last;
+       }
        my $conn = $conn[$i0-1];
        my $ev = $conn->last_event();
        my $evstr = ZOOM::event_str($ev);
@@ -464,7 +477,7 @@ sub check {
            }
 
        } elsif ($res == ZOOM::IRSpy::Status::TEST_SKIPPED) {
-           $conn->log("irspy_task", "test skipped during task $task");
+           $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
@@ -476,23 +489,46 @@ 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} }) {
        my $test = $conn->option("current_test_address");
        my $next = $this->_next_test($test);
        if (defined $next) {
-           warn "$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()) {
-           warn "$conn still has an active task $task";
+           $this->log("irspy", "$conn still has an active task $task");
+           $finished = 0;
        }
        if (my $task = $conn->next_task()) {
-           warn "$conn still has a queued task $task";
+           $this->log("irspy", "$conn still has a queued task $task");
+           $finished = 0;
        }
        if (!$conn->is_idle()) {
-           warn "$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();
+       if ($ev != 0) { # Or ZOOM::Event::ZEND?
+           my $evstr = ZOOM::event_str($ev);
+           $this->log("irspy", "$conn has event $ev ($evstr) waiting");
+           $finished = 0;
        }
        if (!$conn->option("rewrote_record")) {
-           warn "$conn did not rewrite its ZeeRex record";
+           $this->log("irspy", "$conn did not rewrite its ZeeRex record");
+           $finished = 0;
+       }
+    }
+
+    # This really shouldn't be necessary, and in practice it rarely
+    # helps, but it's belt and braces
+    if (!$finished) {
+       if (++$nruns < 3) {
+           $this->log("irspy", "back into main loop, ${nruns}th time");
+           goto ROUND_AND_ROUND_WE_GO;
+       } else {
+           $this->log("irspy", "bailing after $nruns main-loop runs");
        }
     }