X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=64c1d4d373f0b9b9a7de08a4841c07dd99f5eefb;hp=22c3cd8048520241698d44f3ac6cb2aff0f3b044;hb=6e77999558aee37d940a5288bb0709a8cc2cc6c3;hpb=b5d35f645df7e9630f77ec7f364ba27378775211
diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 22c3cd8..64c1d4d 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,16 +1,31 @@
-# $Id: IRSpy.pm,v 1.19 2006-09-26 09:08:36 mike Exp $
+# $Id: IRSpy.pm,v 1.26 2006-10-12 11:06:03 mike Exp $
package ZOOM::IRSpy;
use 5.008;
use strict;
use warnings;
+
+use Data::Dumper; # For debugging only
+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;
our @ISA = qw();
our $VERSION = '0.02';
+
+# 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
+package ZOOM::IRSpy;
+
+
=head1 NAME
ZOOM::IRSpy - Perl extension for discovering and analysing IR services
@@ -33,6 +48,8 @@ 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");
}
sub new {
@@ -51,8 +68,7 @@ sub new {
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
tests => [], # stack of tests currently being executed
}, $class;
$this->log("irspy", "starting up with database '$dbname'");
@@ -86,8 +102,7 @@ sub targets {
$this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
$target = $newtarget; # This is written through the ref
}
- push @qlist,
- (qq[(host = "$host" and port = "$port" and path="$db")]);
+ push @qlist, (qq[(host="$host" and port="$port" and path="$db")]);
}
$this->{targets} = \@targets;
@@ -151,8 +166,10 @@ sub initialise {
}
}
+ $this->log("irspy_debug", "query '", $this->{query}, "'");
my $rs = $this->{conn}->search(new ZOOM::Query::CQL($this->{query}));
- #print "size='", $rs->size(), "'\n";
+ delete $this->{query}; # No longer needed at all
+ $this->log("irspy_debug", "found ", $rs->size(), " target records");
foreach my $i (1 .. $rs->size()) {
my $target = _render_record($rs, $i-1, "id");
my $zeerex = _render_record($rs, $i-1, "zeerex");
@@ -163,21 +180,32 @@ sub initialise {
if $this->{allrecords};
}
+ # 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'");
- #print STDERR "making '$target' record without zeerex\n";
$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}
}
@@ -195,17 +223,12 @@ sub _render_record {
}
-# Returns:
-# 0 all tests successfully run
-# 1 some tests skipped
-#
-sub check {
+sub _rewrite_records {
my $this = shift();
- my $res = $this->_run_test("Main");
- foreach my $target (sort keys %{ $this->{target2record} }) {
- my $rec = $this->{target2record}->{$target};
- # Write record back to database
+ # Write modified records back to database
+ foreach my $conn (@{ $this->{connections} }) {
+ my $rec = $conn->record();
my $p = $this->{conn}->package();
$p->option(action => "specialUpdate");
my $xml = $rec->{zeerex}->toString();
@@ -223,18 +246,174 @@ sub check {
print "Updated with xml=
\n$xml
\n";
}
}
-
- return $res;
}
-sub _run_test {
+# 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";
+ #$this->{tree}->print(0);
+ my $nskipped = 0;
+
+ my @conn = @{ $this->{connections} };
+
+ while (1) {
+ my @copy_conn = @conn; # avoid alias problems after splice()
+ foreach my $i0 (0 .. $#copy_conn) {
+ my $conn = $copy_conn[$i0];
+ #print "connection $i0 of ", scalar(@copy_conn), " from ", 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 = defined $address ?
+ $this->_next_test($address) : "";
+ if (!defined $nextaddr) {
+ $conn->log("irspy", "has no more tests: removing");
+ splice @conn, $i0, 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", "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", "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", "starting task $task");
+ $conn->next_task(0);
+ $conn->current_task($task);
+ $task->run();
+ }
+
+ ### Test $conn->is_idle() here?
+ }
+
+ 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
+ my $conn = $conn[$i0-1];
+ my $ev = $conn->last_event();
+ my $evstr = ZOOM::event_str($ev);
+ $conn->log("irspy_event", "event $ev ($evstr)");
+
+ 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 ($@) {
+ my $sub = $task->{cb}->{exception};
+ die $@ if !defined $sub;
+ $res = &$sub($conn, $task, $@);
+ } else {
+ my $sub = $task->{cb}->{$ev};
+ if (!defined $sub) {
+ $conn->log("irspy_unhandled", "event $ev ($evstr)");
+ next;
+ }
+
+ $res = &$sub($conn, $task, $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", "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", "test completed ($x)");
+ $conn->current_task(0);
+ $conn->next_task(0);
+ ### Should also skip over remaining sibling tests if TEST_BAD
+ $nskipped += 1; # should count number of skipped siblings
+ }
+ }
+
+ $this->log("irspy_event", "no more events: finishing");
+
+ #$this->_rewrite_records();
+ return $nskipped;
+}
+
+
+sub _gather_tests {
+ my $this = shift();
+ my($tname, @ancestors) = @_;
+
die("$0: test-hierarchy loop detected: " .
- join(" -> ", @{ $this->{tests} }, $tname))
- if grep { $_ eq $tname } @{ $this->{tests} };
+ join(" -> ", @ancestors, $tname))
+ if grep { $_ eq $tname } @ancestors;
eval {
my $slashSeperatedTname = $tname;
@@ -243,52 +422,52 @@ sub _run_test {
}; if ($@) {
$this->log("warn", "can't load test '$tname': skipping",
$@ =~ /^Can.t locate/ ? () : " ($@)");
- return 1;
+ return undef;
+ }
+
+ $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;
}
- $this->log("irspy", "running test '$tname'");
- push @{ $this->{tests} }, $tname;
- my $test = "ZOOM::IRSpy::Test::$tname"->new($this);
- my $res =$test->run();
- pop @{ $this->{tests} };
- return $res;
+ return new ZOOM::IRSpy::Node($tname, @subnodes);
}
-# Access methods for the use of Test modules
-sub pod {
+sub _next_test {
my $this = shift();
- return $this->{pod};
-}
+ my($address, $omit_child) = @_;
-sub record {
- my $this = shift();
- my($target) = @_;
+ $this->log("irspy", "checking for next test after '$address'");
- 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");
+ # Try first child
+ if (!$omit_child) {
+ my $maybe = $address eq "" ? "0" : "$address:0";
+ return $maybe if $this->{tree}->select($maybe);
}
- return $this->{target2record}->{lc($target)};
-}
+ # 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);
-# Utility method, really nothing to do with IRSpy
-sub isodate {
- my $this = shift();
- my($time) = @_;
-
- my($sec, $min, $hour, $mday, $mon, $year) = localtime($time);
- return sprintf("%04d-%02d-%02dT%02d:%02d:%02d",
- $year+1900, $mon+1, $mday, $hour, $min, $sec);
+ # This node is exhausted: try the parent's successor
+ return $this->_next_test(join(":", @components), 1)
}
=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/
@@ -310,4 +489,5 @@ at your option, any later version of Perl 5 you may have available.
=cut
+
1;