X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=d901c6b5b047bb5a7951bca67b3104d30229b672;hb=2090157518d0d2da860345507680f4ad91b043a2;hp=08703d7c8230e49b780d71821d60cbd65719a1d4;hpb=83445c4f6ec6c885260944a9abe648aced399c40;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 08703d7c..d901c6b5 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -8,12 +8,25 @@
 #       To allow debugging of a category (e.g. 'chan') but not onto disc (just into the ring buffer)
 #       do: set/debug chan nologchan
 #
+#       To print the current contents into the debug log: show/debug_ring
+#
+#       On exit or serious error the ring buffer is printed to the current debug log
+#
+# In Progress:
+#       Expose a localhost listener on port (default) 27755 to things like watchdbg so that they can carry on
+#       as normal, possibly with a "remember" button to permanently capture stuff observed.
+#
+# Future:
+#       This is likely to be some form of triggering or filtering controlling (some portion
+#       of) ring_buffer dumping.
+#
+#
 
 package DXDebug;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck);
+@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck carp);
 
 use strict;
 use vars qw(%dbglevel $fp $callback $cleandays $keepdays $dbgringlth);
@@ -39,27 +52,29 @@ if (!defined $DB::VERSION) {
 	local $^W=0;
 	eval qq( sub confess { 
 	    \$SIG{__DIE__} = 'DEFAULT'; 
-        DXDebug::dbgprintring() unless DXDebug::isdbg('chan');
-        DXDebug::dbgclearring();
+        DXDebug::dbgprintring() if DXDebug::isdbg('nologchan');
         DXDebug::dbg(\$@);
 		DXDebug::dbg(Carp::shortmess(\@_));
 	    exit(-1); 
 	}
 	sub croak { 
 		\$SIG{__DIE__} = 'DEFAULT'; 
-        DXDebug::dbgprintring() unless DXDebug::isdbg('chan');
-        DXDebug::dbgclearring();
+        DXDebug::dbgprintring() if DXDebug::isdbg('nologchan');
         DXDebug::dbg(\$@);
 		DXDebug::dbg(Carp::longmess(\@_));
 		exit(-1); 
 	}
-	sub carp    { DXDebug::dbg(Carp::shortmess(\@_)); }
-	sub cluck   { DXDebug::dbg(Carp::longmess(\@_)); } 
-	);
+	sub carp { 
+        DXDebug::dbgprintring(25) if DXDebug('nologchan');
+        DXDebug::dbg(Carp::shortmess(\@_)); 
+    }
+	sub cluck { 
+        DXDebug::dbgprintring(25) if DXDebug('nologchan');
+        DXDebug::dbg(Carp::longmess(\@_)); 
+    } );
 
     CORE::die(Carp::shortmess($@)) if $@;
-}
-else {
+} else {
     eval qq( sub confess { die Carp::longmess(\@_); }; 
 			 sub croak { die Carp::shortmess(\@_); }; 
 			 sub cluck { warn Carp::longmess(\@_); }; 
@@ -68,26 +83,27 @@ else {
 } 
 
 
-my $_isdbg;						# current dbg level we are processing
+my $_isdbg = '';						# current dbg level we are processing
 
-sub dbg($)
+sub dbg
 {
-	return unless $fp;
+#	return unless $fp;
 	my $t = time; 
 	for (@_) {
 		my $r = $_;
 		chomp $r;
 		my @l = split /\n/, $r;
-		for (@l) {
-			s/([\x00-\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-			print "$_\n" if defined \*STDOUT && !$no_stdout;
-			my $str = "$t^$_";
+		foreach my $l (@l) {
+			$l =~ s/([\x00-\x08\x0B-\x1f\x7f-\xff])/sprintf("%%%02X",ord($1))/eg;
+			print "$l\n" if defined \*STDOUT && !$no_stdout;
+			my $tag = $_isdbg ? "($_isdbg) " : '(*) ';
+			my $str = "$t^$tag$l";
 			&$callback($str) if $callback;
 			if ($dbgringlth) {
 				shift @dbgring while (@dbgring > $dbgringlth);
 				push @dbgring, $str;
 			}
-			$fp->writeunix($t, $str) unless $dbglevel{"nolog$_isdbg"}; 
+			$fp->writeunix($t, $str) unless !$fp || $dbglevel{"nolog$_isdbg"} ; 
 		}
 	}
 	$_isdbg = '';
@@ -202,24 +218,32 @@ sub longmess
 sub dbgprintring
 {
 	return unless $fp;
+	my $i = shift || 0;
+	my $count = @dbgring;
+	$i =  @dbgring-$i if $i;
+	return 0 unless $i < $count;	# do nothing if there is nothing to print
+
 	my $first;
-	while (my $l = shift @dbgring) {
-		my ($t, $str) = split /\^/, $l, 2;
+	my $l;
+	for ( ; $i < $count; ++$i) {
+		my ($t, $str) = split /\^/, $dbgring[$i], 2;
 		next unless $t;
 		my $lt = time;
 		unless ($first) {
 			$fp->writeunix($lt, "$lt^###");
-			$fp->writeunix($lt, "$lt^### RINGBUFFER START");
+			$fp->writeunix($lt, "$lt^### RINGBUFFER START at line $i (zero base)");
 			$fp->writeunix($lt, "$lt^###");
 			$first = $t;
 		}
 		my $buf = sprintf "%02d:%02d:%02d", (gmtime($t))[2,1,0];
 		$fp->writeunix($lt, "$lt^RING: $buf^$str");
+		++$l;
 	}
 	my $et = time;
 	$fp->writeunix($et, "$et^###");
-	$fp->writeunix($et, "$et^### RINGBUFFER END");
+	$fp->writeunix($et, "$et^### RINGBUFFER END $l debug lines written");
 	$fp->writeunix($et, "$et^###");
+	return $l;
 }
 
 sub dbgclearring