-# $Id: IRSpy.pm,v 1.63 2007-02-22 15:43:13 mike Exp $
+# $Id: IRSpy.pm,v 1.72 2007-02-28 17:36:00 mike Exp $
package ZOOM::IRSpy;
}
+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) = @_;
# 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.
$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");
$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
if ($save_xml) {
unlink('/tmp/irspy_orig.xml');
- open FH, '>/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 $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params);
if ($save_xml) {
unlink('/tmp/irspy_transformed.xml');
- open FH, '>/tmp/irspy_transformed.xml';
+ open FH, '>/tmp/irspy_transformed.xml'
+ or die "can't write irspy_transformed.xml: $!";
print FH $result->toString();
close FH;
}
$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;
}
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);
$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");
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::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 ZEND.
- $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) {
$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_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'";
$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()) {
$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();
}
# 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");
}
# 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();
projects / irspy-moved-to-github.git / blobdiff