X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=8320c8445fc5cdc1281583ecd61f108fb55b8219;hb=93ae498c754d95bd05d687220477be2fe4316757;hp=64c1d4d373f0b9b9a7de08a4841c07dd99f5eefb;hpb=6e77999558aee37d940a5288bb0709a8cc2cc6c3;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 64c1d4d..8320c84 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.26 2006-10-12 11:06:03 mike Exp $
+# $Id: IRSpy.pm,v 1.29 2006-10-12 16:54:13 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -46,10 +46,11 @@ 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 {
@@ -299,8 +300,13 @@ sub check {
 		    # 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) : "";
+		    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");
 			splice @conn, $i0, 1;
@@ -311,7 +317,7 @@ sub check {
 			or die "invalid nextaddr '$nextaddr'";
 		    $conn->option(current_test_address => $nextaddr);
 		    my $tname = $node->name();
-		    $conn->log("irspy", "starting test '$nextaddr' = $tname");
+		    $conn->log("irspy_test", "starting test '$nextaddr' = $tname");
 		    my $tasks = $conn->tasks();
 		    my $oldcount = @$tasks;
 		    "ZOOM::IRSpy::Test::$tname"->start($conn);
@@ -320,20 +326,20 @@ sub check {
 			# 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");
+			$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", "starting task $task");
+		$conn->log("irspy_task", "starting task $task");
 		$conn->next_task(0);
 		$conn->current_task($task);
 		$task->run();
 	    }
 
-	    ### Test $conn->is_idle() here?
+	    # Do we need to test $conn->is_idle()?  I don't think so!
 	}
 
 	my $i0 = ZOOM::event(\@conn);
@@ -367,7 +373,7 @@ sub check {
 	if ($@) {
 	    my $sub = $task->{cb}->{exception};
 	    die $@ if !defined $sub;
-	    $res = &$sub($conn, $task, $@);
+	    $res = &$sub($conn, $task, $task->udata(), $@);
 	} else {
 	    my $sub = $task->{cb}->{$ev};
 	    if (!defined $sub) {
@@ -375,7 +381,7 @@ sub check {
 		next;
 	    }
 
-	    $res = &$sub($conn, $task, $ev);
+	    $res = &$sub($conn, $task, $task->udata(), $ev);
 	}
 
 	if ($res == ZOOM::IRSpy::Status::OK) {
@@ -385,22 +391,25 @@ sub check {
 	    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->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", "test completed ($x)");
+	    $conn->log("irspy_test", "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
+	    if ($res == ZOOM::IRSpy::Status::TEST_BAD) {
+		### Should skip over remaining sibling tests if TEST_BAD
+		### Should count the number of skipped siblings
+		$nskipped += 1;
+	    }
 	}
     }
 
-    $this->log("irspy_event", "no more events: finishing");
+    $this->log("irspy", "exiting main loop");
 
     #$this->_rewrite_records();
     return $nskipped;
@@ -440,8 +449,6 @@ sub _next_test {
     my $this = shift();
     my($address, $omit_child) = @_;
 
-    $this->log("irspy", "checking for next test after '$address'");
-
     # Try first child
     if (!$omit_child) {
 	my $maybe = $address eq "" ? "0" : "$address:0";