X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=b3c0aeb15e8de464b155625bccabe60bd052d75d;hp=d9674b7e18c21763b3e11aae74d74534ece871f4;hb=09a78b8e8d348d62681278705447c19070cbd6b1;hpb=1c15a53bce6a147a780e73e7aad11ef4838916bd diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm index d9674b7..b3c0aeb 100644 --- a/lib/ZOOM/IRSpy.pm +++ b/lib/ZOOM/IRSpy.pm @@ -1,15 +1,38 @@ -# $Id: IRSpy.pm,v 1.9 2006-07-21 11:28:16 mike Exp $ +# $Id: IRSpy.pm,v 1.72 2007-02-28 17:36:00 mike Exp $ package ZOOM::IRSpy; use 5.008; use strict; use warnings; + +use Data::Dumper; # For debugging only +use File::Basename; +use XML::LibXSLT; +use XML::LibXML; +use XML::LibXML::XPathContext; +use ZOOM; +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::Pod; +use ZOOM::IRSpy::Stats; +use ZOOM::IRSpy::Utils qw(cql_target); our @ISA = qw(); our $VERSION = '0.02'; +our $irspy_to_zeerex_xsl = dirname(__FILE__) . '/../../xsl/irspy2zeerex.xsl'; + + +# Enumeration for callback functions to return +package ZOOM::IRSpy::Status; +sub OK { 29 } # No problems, task is still progressing +sub TASK_DONE { 18 } # Task is complete, next task should begin +sub TEST_GOOD { 8 } # Whole test is complete, and succeeded +sub TEST_BAD { 31 } # Whole test is complete, and failed +sub TEST_SKIPPED { 12 } # Test couldn't be run +package ZOOM::IRSpy; + =head1 NAME @@ -19,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 @@ -31,24 +56,42 @@ protocols. It is a successor to the ZSpy program. BEGIN { ZOOM::Log::mask_str("irspy"); - ZOOM::Log::mask_str("irspy_test"); ZOOM::Log::mask_str("irspy_debug"); + ZOOM::Log::mask_str("irspy_event"); + ZOOM::Log::mask_str("irspy_unhandled"); + ZOOM::Log::mask_str("irspy_test"); + ZOOM::Log::mask_str("irspy_task"); } sub new { my $class = shift(); - my($dbname) = @_; + my($dbname, $user, $password) = @_; + + my @options; + push @options, (user => $user, password => $password) + if defined $user; - my $conn = new ZOOM::Connection($dbname) + my $conn = new ZOOM::Connection($dbname, 0, @options) 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); + my $this = bless { conn => $conn, allrecords => 1, # unless overridden by targets() query => undef, # filled in later targets => undef, # filled in later - target2record => undef, # filled in later - pod => undef, # filled in later + connections => undef, # filled in later + libxml => $libxml, + irspy_to_zeerex_style => $irspy_to_zeerex_style, + tests => [], # stack of tests currently being executed }, $class; $this->log("irspy", "starting up with database '$dbname'"); @@ -69,20 +112,19 @@ sub log { # sub targets { my $this = shift(); - my($targetList) = @_; + my(@targets) = @_; - $this->log("irspy", "setting explicit list of targets '$targetList'"); + $this->log("irspy", "setting explicit list of targets ", + join(", ", map { "'$_'" } @targets)); $this->{allrecords} = 0; - my @targets = split /\s+/, $targetList; my @qlist; foreach my $target (@targets) { my($host, $port, $db, $newtarget) = _parse_target_string($target); if ($newtarget ne $target) { $this->log("irspy_debug", "rewriting '$target' to '$newtarget'"); - $target = $newtarget; # This written through the ref + $target = $newtarget; # This is written through the ref } - push @qlist, - (qq[(host = "$host" and port = "$port" and path="$db")]); + push @qlist, cql_target($host, $port, $db); } $this->{targets} = \@targets; @@ -90,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) = @_; @@ -100,7 +151,7 @@ sub _parse_target_string { ($host, $db) = ($target =~ /(.*?)\/(.*)/); $target = "$host:$port/$db"; } - die "invalid target string '$target'" + die "$0: invalid target string '$target'" if !defined $host; return ($host, $port, $db, $target); @@ -137,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. @@ -146,28 +197,48 @@ 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 + 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"); + #print STDERR "making '$target' record with '$zeerex'\n"; $target2record{lc($target)} = - new ZOOM::IRSpy::Record($target, $zeerex); + new ZOOM::IRSpy::Record($this, $target, $zeerex); + push @{ $this->{targets} }, $target + if $gatherTargets; } + # Make records for targets not previously in the database foreach my $target (keys %target2record) { my $record = $target2record{$target}; if (!defined $record) { $this->log("irspy_debug", "made new record for '$target'"); - $target2record{$target} = new ZOOM::IRSpy::Record($target); + $target2record{$target} = new ZOOM::IRSpy::Record($this, $target); } else { $this->log("irspy_debug", "using existing record for '$target'"); } } - $this->{target2record} = \%target2record; - $this->{pod} = new ZOOM::Pod(@{ $this->{targets} }); - delete $this->{targets}; # The information is now in the Pod. - delete $this->{query}; # Not needed at all + my @connections; + foreach my $target (@{ $this->{targets} }) { + my $conn = create ZOOM::IRSpy::Connection($this, async => 1); + $conn->option(host => $target); + my $record = delete $target2record{lc($target)}; + $conn->record($record); + push @connections, $conn; + } + die("remaining target2record = { " . + join(", ", map { "$_ ->'" . $target2record{$_}. "'" } + sort keys %target2record) . " }") + if %target2record; + + $this->{connections} = \@connections; + delete $this->{targets}; # The information is now in {connections} } @@ -185,61 +256,416 @@ sub _render_record { } -# Returns: -# 0 all tests successfully run -# 1 some tests skipped +sub _irspy_to_zeerex { + 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(); +} + + +sub _rewrite_record { + my $this = shift(); + my($conn) = @_; + + $conn->log("irspy", "rewriting XML record"); + my $rec = $this->_irspy_to_zeerex($conn, $ENV{IRSPY_SAVE_XML}); + _really_rewrite_record($this->{conn}, $rec); +} + + +sub _really_rewrite_record { + my($conn, $rec) = @_; + + my $p = $conn->package(); + $p->option(action => "specialUpdate"); + my $xml = $rec->toString(); + $p->option(record => $xml); + $p->send("update"); + $p->destroy(); + + $p = $conn->package(); + $p->send("commit"); + $p->destroy(); + if (0) { + $xml =~ s/&/&/g; + $xml =~ s//>/g; + print "Updated $conn with xml=
\n
$xml
\n"; + } +} + + +# The approach: gather declarative information about test hierarchy, +# then go into a loop. In the loop, we ensure that each connection is +# running a test, and within that test a task, until its list of tests +# is exhausted. No individual test ever calls wait(): tests just queue +# up tasks and return immediately. When the tasks are run (one at a +# time on each connection) they generate events, and it is these that +# are harvested by ZOOM::event(). Since each connection knows what +# task it is running, it can invoke the appropriate callbacks. +# Callbacks return a ZOOM::IRSpy::Status value which tells the main +# loop how to continue. +# +# Invariants: +# While a connection is running a task, its current_task() +# points at the task structure. When it finishes its task, +# next_task() is pointed at the next task to execute (if there +# is one), and its current_task() is set to zero. When the next +# task is executed, the connection's next_task() is set to zero +# and its current_task() pointed to the task structure. +# current_task() and next_task() are both zero only when there +# are no more queued tasks, which is when a new test is +# started. +# +# Each connection's current test is stored in its +# "current_test_address" option. The next test to execute is +# calculated by walking the declarative tree of tests. This +# option begins empty; the "next test" after this is of course +# the root test. # sub check { my $this = shift(); + my($tname) = @_; + + $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); + foreach my $i0 (0 .. $#copy_conn) { + my $conn = $copy_conn[$i0]; + #print "connection $i0 of $nconn/", scalar(@conn), " is $conn\n"; + if (!$conn->current_task()) { + if (!$conn->next_task()) { + # Out of tasks: we need a new test + NEXT_TEST: + my $address = $conn->option("current_test_address"); + my $nextaddr; + if (!defined $address) { + $nextaddr = ""; + } else { + $this->log("irspy_test", + "checking for next test after '$address'"); + $nextaddr = $this->_next_test($address); + } + 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); + next; + } + + my $node = $this->{tree}->select($nextaddr) + or die "invalid nextaddr '$nextaddr'"; + $conn->option(current_test_address => $nextaddr); + my $tname = $node->name(); + $conn->log("irspy_test", + "starting test '$nextaddr' = $tname"); + my $tasks = $conn->tasks(); + my $oldcount = @$tasks; + "ZOOM::IRSpy::Test::$tname"->start($conn); + $tasks = $conn->tasks(); + if (@$tasks > $oldcount) { + # Prepare to start the first of the newly added tasks + $conn->next_task($tasks->[$oldcount]); + } else { + $conn->log("irspy_task", + "no tasks added by new test $tname"); + goto NEXT_TEST; + } + } + + my $task = $conn->next_task(); + die "no next task queued for $conn" if !defined $task; + $conn->log("irspy_task", "preparing task $task"); + $conn->next_task(0); + $conn->current_task($task); + $task->run(); + } + } + + NEXT_EVENT: + my $i0 = ZOOM::event(\@conn); + $this->log("irspy_event", + "ZOOM_event(", scalar(@conn), " connections) = $i0"); + 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; + } - return $this->_run_test("Main"); + 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; + + my $res; + 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) { + $conn->log("irspy_unhandled", "event $ev ($evstr)"); + next; + } + + $res = &$sub($conn, $task, $task->udata(), $ev); + } + + if ($res == ZOOM::IRSpy::Status::OK) { + # Nothing to do -- life continues + + } elsif ($res == ZOOM::IRSpy::Status::TASK_DONE) { + my $task = $conn->current_task(); + die "no task for TASK_DONE on $conn" if !$task; + die "next task already defined for $conn" if $conn->next_task(); + $conn->log("irspy_task", "completed task $task"); + $conn->next_task($task->{next}); + $conn->current_task(0); + + } elsif ($res == ZOOM::IRSpy::Status::TEST_GOOD || + $res == ZOOM::IRSpy::Status::TEST_BAD) { + my $x = ($res == ZOOM::IRSpy::Status::TEST_GOOD) ? "good" : "bad"; + $conn->log("irspy_task", "test ended during task $task ($x)"); + $conn->log("irspy_test", "test completed ($x)"); + $conn->current_task(0); + $conn->next_task(0); + if ($res == ZOOM::IRSpy::Status::TEST_BAD) { + my $address = $conn->option('current_test_address'); + $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_test", "test skipped during task $task"); + $conn->current_task(0); + $conn->next_task(0); + $nskipped++; + + } else { + die "unknown callback return-value '$res'"; + } + } + + $this->log("irspy", "exiting main loop"); + # Sanity checks: none of the following should ever happen + 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) { + $this->log("irspy", + "$conn (in test '$test') has queued test '$next'"); + $finished = 0; + } + if (my $task = $conn->current_task()) { + $this->log("irspy", "$conn still has an active task $task"); + $finished = 0; + } + if (my $task = $conn->next_task()) { + $this->log("irspy", "$conn still has a queued task $task"); + $finished = 0; + } + if (!$conn->is_idle()) { + $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")) { + $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: + while ((my $i1 = ZOOM::event(\@conn)) > 0) { + my $conn = $conn[$i1-1]; + my $ev = $conn->last_event(); + my $evstr = ZOOM::event_str($ev); + $this->log("irspy", + "$conn still has ZOOM-C level task queued: $ev ($evstr)") + if $ev != ZOOM::Event::ZEND; + } + + return $nskipped; } -sub _run_test { +sub _gather_tests { my $this = shift(); - my($tname) = @_; + my($tname, @ancestors) = @_; + + die("$0: test-hierarchy loop detected: " . + join(" -> ", @ancestors, $tname)) + if grep { $_ eq $tname } @ancestors; + + my $slashSeperatedTname = $tname; + $slashSeperatedTname =~ s/::/\//g; + my $fullName = "ZOOM/IRSpy/Test/$slashSeperatedTname.pm"; eval { - my $slashSeperatedTname = $tname; - $slashSeperatedTname =~ s/::/\//g; - require "ZOOM/IRSpy/Test/$slashSeperatedTname.pm"; + require $fullName; + $this->log("irspy", "successfully required '$fullName'"); }; if ($@) { + $this->log("irspy", "couldn't require '$fullName': $@"); $this->log("warn", "can't load test '$tname': skipping", $@ =~ /^Can.t locate/ ? () : " ($@)"); - return 1; + return undef; } - $this->log("irspy", "running test '$tname'"); - my $test = "ZOOM::IRSpy::Test::$tname"->new($this); - return $test->run(); + $this->log("irspy", "adding test '$tname'"); + my @subnodes; + foreach my $subtname ("ZOOM::IRSpy::Test::$tname"->subtests($this)) { + my $subtest = $this->_gather_tests($subtname, @ancestors, $tname); + push @subnodes, $subtest if defined $subtest; + } + + return new ZOOM::IRSpy::Node($tname, @subnodes); } -# Access methods for the use of Test modules -sub pod { +# These next three should arguably be Node methods +sub _next_test { my $this = shift(); - return $this->{pod}; + my($address, $omit_child) = @_; + + # Try first child + if (!$omit_child) { + my $maybe = $address eq "" ? "0" : "$address:0"; + return $maybe if $this->{tree}->select($maybe); + } + + # The top-level node has no successor or parent + return undef if $address eq ""; + + # Try next sibling child + my @components = split /:/, $address; + my $last = pop @components; + my $maybe = join(":", @components, $last+1); + return $maybe if $this->{tree}->select($maybe); + + # This node is exhausted: try the parent's successor + return $this->_next_test(join(":", @components), 1) } -sub record { - my $this = shift(); - my($target) = @_; - if (ref($target) && $target->isa("ZOOM::Connection")) { - # Can be called with a Connection instead of a target-name - my $conn = $target; - $target = $conn->option("host"); +sub _last_sibling_test { + my $this = shift(); + my($address) = @_; + + return undef + if !defined $this->_next_sibling_test($address); + + my $nskipped = 0; + while (1) { + my $maybe = $this->_next_sibling_test($address); + last if !defined $maybe; + $nskipped++; + $address = $maybe; + $this->log("irspy", "skipping $nskipped tests to '$address'"); } - return $this->{target2record}->{lc($target)}; + return ($address, $nskipped); } +sub _next_sibling_test { + my $this = shift(); + my($address) = @_; + + my @components = split /:/, $address; + my $last = pop @components; + my $maybe = join(":", @components, $last+1); + return $maybe if $this->{tree}->select($maybe); + return undef; +} + =head1 SEE ALSO -ZOOM::IRSpy::Record +ZOOM::IRSpy::Record, +ZOOM::IRSpy::Web, +ZOOM::IRSpy::Test, +ZOOM::IRSpy::Maintenance. The ZOOM-Perl module, http://search.cpan.org/~mirk/Net-Z3950-ZOOM/ @@ -261,4 +687,5 @@ at your option, any later version of Perl 5 you may have available. =cut + 1;