X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=d901c6b5b047bb5a7951bca67b3104d30229b672;hb=8ce11d49e52f2ae6ed3c0ddf2a54b2941544acc3;hp=947923f2d4a4acb499f1d9b2fc5ef90a58809c08;hpb=63f0fc26e717837bc7c6990f27d26de91d65eb7e;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 947923f2..d901c6b5 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -26,7 +26,7 @@ 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);
@@ -83,26 +83,27 @@ if (!defined $DB::VERSION) {
 } 
 
 
-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 = '';
@@ -217,11 +218,13 @@ sub longmess
 sub dbgprintring
 {
 	return unless $fp;
-	my $count = shift;
+	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;
 	my $l;
-	my $i = defined $count ? @dbgring-$count : 0;
-	$count = @dbgring;
 	for ( ; $i < $count; ++$i) {
 		my ($t, $str) = split /\^/, $dbgring[$i], 2;
 		next unless $t;
@@ -234,11 +237,13 @@ sub dbgprintring
 		}
 		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