X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=a496c67e78bf2115dc3e4fb63142d2fa953ec0ba;hb=9a2899855f877172facc65a396ce5f6157d3ecd3;hp=6ea8910d8d669860c72e20805c9a7f92b6637b4b;hpb=dfad8457017003a53ac4449456e632439fdb3235;p=irspy-moved-to-github.git diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm index 6ea8910..a496c67 100644 --- a/lib/ZOOM/IRSpy.pm +++ b/lib/ZOOM/IRSpy.pm @@ -1,4 +1,4 @@ -# $Id: IRSpy.pm,v 1.64 2007-02-22 17:46:23 mike Exp $ +# $Id: IRSpy.pm,v 1.66 2007-02-23 13:18:43 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,8 +398,6 @@ sub check { $conn->current_task($task); $task->run(); } - - # Do we need to test $conn->is_idle()? I don't think so! } my $i0 = ZOOM::event(\@conn); @@ -502,11 +501,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()) { @@ -518,7 +519,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(); @@ -534,8 +536,8 @@ sub check { } # This really shouldn't be necessary, and in practice it rarely - # helps, but it's belt and braces. For now, we don't do this - # (hence the zero in the $nruns check). + # 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 < 0) { $this->log("irspy", "back into main loop, ${nruns}th time"); @@ -546,7 +548,6 @@ sub check { } # This shouldn't happen emit anything either: - @conn = @{ $this->{connections} }; while ((my $i1 = ZOOM::event(\@conn)) > 0) { my $conn = $conn[$i1-1]; my $ev = $conn->last_event();