X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=b3c0aeb15e8de464b155625bccabe60bd052d75d;hp=ea292c9cb2320b9222eaed346416c6ee91cb44f0;hb=09a78b8e8d348d62681278705447c19070cbd6b1;hpb=3d4502ccfb264eb85f4dc9c895becc6018b3b520 diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm index ea292c9..b3c0aeb 100644 --- a/lib/ZOOM/IRSpy.pm +++ b/lib/ZOOM/IRSpy.pm @@ -1,4 +1,4 @@ -# $Id: IRSpy.pm,v 1.51 2006-11-21 11:48:01 mike Exp $ +# $Id: IRSpy.pm,v 1.72 2007-02-28 17:36:00 mike Exp $ package ZOOM::IRSpy; @@ -16,6 +16,7 @@ use Net::Z3950::ZOOM 1.13; # For the ZOOM version-check only use ZOOM::IRSpy::Node; use ZOOM::IRSpy::Connection; use ZOOM::IRSpy::Record; +use ZOOM::IRSpy::Stats; use ZOOM::IRSpy::Utils qw(cql_target); our @ISA = qw(); @@ -41,7 +42,9 @@ ZOOM::IRSpy - Perl extension for discovering and analysing IR services use ZOOM::IRSpy; $spy = new ZOOM::IRSpy("target/string/for/irspy/database"); - print $spy->report_status(); + $spy->targets(@targets); + $spy->initialise(); + $res = $spy->check("Main"); =head1 DESCRIPTION @@ -72,6 +75,10 @@ sub new { or die "$0: can't connection to IRSpy database 'dbname'"; my $xslt = new XML::LibXSLT; + + $xslt->register_function($ZOOM::IRSpy::Utils::IRSPY_NS, 'strcmp', + \&ZOOM::IRSpy::Utils::xslt_strcmp); + my $libxml = new XML::LibXML; my $xsl_doc = $libxml->parse_file($irspy_to_zeerex_xsl); my $irspy_to_zeerex_style = $xslt->parse_stylesheet($xsl_doc); @@ -125,6 +132,15 @@ sub targets { } +sub find_targets { + my $this = shift(); + my($query) = @_; + + $this->{allrecords} = 0; + $this->{query} = $query; +} + + # Also used by ZOOM::IRSpy::Record sub _parse_target_string { my($target) = @_; @@ -172,7 +188,7 @@ sub initialise { # access point -- not even 1035 "everywhere" -- so instead we # hack together a search that we know will find all records. $this->{query} = "port=?*"; - } else { + } elsif ($this->{targets}) { # Prepopulate the target map with nulls so that after we fill # in what we can from the database query, we know which target # IDs we need new records for. @@ -183,8 +199,10 @@ sub initialise { $this->log("irspy_debug", "query '", $this->{query}, "'"); my $rs = $this->{conn}->search(new ZOOM::Query::CQL($this->{query})); + $this->log("irspy", "'", $this->{query}, "' found ", + $rs->size(), " target records"); delete $this->{query}; # No longer needed at all - $this->log("irspy_debug", "found ", $rs->size(), " target records"); + my $gatherTargets = !$this->{targets}; foreach my $i (1 .. $rs->size()) { my $target = _render_record($rs, $i-1, "id"); my $zeerex = _render_record($rs, $i-1, "zeerex"); @@ -192,7 +210,7 @@ sub initialise { $target2record{lc($target)} = new ZOOM::IRSpy::Record($this, $target, $zeerex); push @{ $this->{targets} }, $target - if $this->{allrecords}; + if $gatherTargets; } # Make records for targets not previously in the database @@ -239,10 +257,26 @@ sub _render_record { sub _irspy_to_zeerex { - my ($this, $conn) = @_; + my $this = shift(); + my($conn, $save_xml) = @_; my $irspy_doc = $conn->record()->{zeerex}->ownerDocument; + + if ($save_xml) { + unlink('/tmp/irspy_orig.xml'); + open FH, '>/tmp/irspy_orig.xml' + or die "can't write irspy_orig.xml: $!"; + print FH $irspy_doc->toString(); + close FH; + } my %params = (); my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params); + if ($save_xml) { + unlink('/tmp/irspy_transformed.xml'); + open FH, '>/tmp/irspy_transformed.xml' + or die "can't write irspy_transformed.xml: $!"; + print FH $result->toString(); + close FH; + } return $result->documentElement(); } @@ -253,7 +287,7 @@ sub _rewrite_record { my($conn) = @_; $conn->log("irspy", "rewriting XML record"); - my $rec = $this->_irspy_to_zeerex($conn); + my $rec = $this->_irspy_to_zeerex($conn, $ENV{IRSPY_SAVE_XML}); _really_rewrite_record($this->{conn}, $rec); } @@ -315,11 +349,14 @@ sub check { $tname = "Main" if !defined $tname; $this->{tree} = $this->_gather_tests($tname) or die "No tests defined for '$tname'"; + $this->{tree}->resolve(); #$this->{tree}->print(0); my $nskipped = 0; 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); @@ -341,6 +378,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); @@ -374,43 +412,42 @@ 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"); - last if $i0 == 0 || $i0 == -3; # no events or no connections + 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::RECV_APDU || - $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 End. - $conn->log("irspy_event", "ignoring error ", - "on event $ev ($evstr): $@"); - next; - } my $res; - if ($@) { + eval { $conn->check() }; + if ($@ && ref $@ && $@->isa("ZOOM::Exception")) { my $sub = $task->{cb}->{exception}; die $@ if !defined $sub; $res = &$sub($conn, $task, $task->udata(), $@); + } elsif ($@) { + die "Unexpected non-ZOOM exception: " . ref($@) . " ($@)"; } else { my $sub = $task->{cb}->{$ev}; if (!defined $sub) { @@ -441,19 +478,29 @@ sub check { $conn->next_task(0); if ($res == ZOOM::IRSpy::Status::TEST_BAD) { my $address = $conn->option('current_test_address'); - ($address, my $n) = $this->_last_sibling_test($address); - if (defined $address) { - $conn->log("irspy_test", "skipped $n tests"); - $conn->option(current_test_address => $address); - $nskipped += $n; + $conn->log("irspy", "top-level test failed!") + if $address eq ""; + my $node = $this->{tree}->select($address); + my $skipcount = 0; + while (defined $node->next() && + length($node->next()->address()) >= length($address)) { + $conn->log("irspy_debug", "skipping from '", + $node->address(), "' to '", + $node->next()->address(), "'"); + $node = $node->next(); + $skipcount++; } + + $conn->option(current_test_address => $node->address()); + $conn->log("irspy_test", "skipped $skipcount tests"); + $nskipped += $skipcount; } } 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 + $nskipped++; } else { die "unknown callback return-value '$res'"; @@ -462,33 +509,61 @@ sub check { $this->log("irspy", "exiting main loop"); # Sanity checks: none of the following should ever happen - foreach my $conn (@{ $this->{connections} }) { + my $finished = 1; + @conn = @{ $this->{connections} }; + foreach my $conn (@conn) { 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 && $ev != 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. (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"); + goto ROUND_AND_ROUND_WE_GO; + } else { + $this->log("irspy", "bailing after $nruns main-loop runs"); } } # 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; } return $nskipped;