X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=790b398d1666d73c431f58d9560ae8ba50c1caee;hb=c9768e5afacacc3dd4004a35aeef2a2e54865177;hp=b42db66dfb4934dd9744b2f9c6fcd00f1b77e8be;hpb=0bd9d2811cc42417676a1b11b121681c2377d70a;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index b42db66d..790b398d 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,46 +11,56 @@ package DXDebug;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist isdbg dbgclose confess croak cluck cluck);
+@EXPORT = qw(dbginit dbgstore dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck cluck);
 
 use strict;
 use vars qw(%dbglevel $fp);
 
 use DXUtil;
 use DXLog ();
-use Carp;
+use Carp qw(cluck);
 
 %dbglevel = ();
-$fp = DXLog::new('debug', 'dat', 'd');
+$fp = undef;
 
 # Avoid generating "subroutine redefined" warnings with the following
 # hack (from CGI::Carp):
 if (!defined $DB::VERSION) {
 	local $^W=0;
 	eval qq( sub confess { 
-	   \$SIG{__DIE__} = 'DEFAULT'; 
-	   DXDebug::_store(Carp::longmess(\@_)); 
-	   exit(-1); 
+	    \$SIG{__DIE__} = 'DEFAULT'; 
+        DXDebug::dbgstore(\$@, Carp::shortmess(\@_));
+	    exit(-1); 
 	}
-	sub confess { 
+	sub croak { 
 		\$SIG{__DIE__} = 'DEFAULT'; 
-		DXDebug::_store(Carp::shortmess(\@_)); 
+        DXDebug::dbgstore(\$@, Carp::longmess(\@_));
 		exit(-1); 
 	}
-	sub carp    { DXDebug::_store(Carp::shortmess(\@_)); }
-	sub cluck   { DXDebug::_store(Carp::longmess(\@_)); } 
+	sub carp    { DXDebug::dbgstore(Carp::shortmess(\@_)); }
+	sub cluck   { DXDebug::dbgstore(Carp::longmess(\@_)); } 
 	);
 
     CORE::die(Carp::shortmess($@)) if $@;
-}
+} else {
+    eval qq( sub confess { Carp::confess(\@_); }; 
+	sub cluck { Carp::cluck(\@_); }; 
+   );
+} 
 
 
-sub _store
+sub dbgstore
 {
 	my $t = time; 
 	for (@_) {
-		$fp->writeunix($t, "$t^$_"); 
-		print STDERR $_;
+		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;
+			$fp->writeunix($t, "$t^$_"); 
+		}
 	}
 }
 
@@ -58,28 +68,43 @@ sub dbginit
 {
 	# add sig{__DIE__} handling
 	if (!defined $DB::VERSION) {
-		$SIG{__WARN__} = sub { _store(Carp::shortmess(@_)); };
-		$SIG{__DIE__} = sub { _store(Carp::shortmess(@_)); };
+		$SIG{__WARN__} = sub { dbgstore($@, Carp::shortmess(@_)); };
+		$SIG{__DIE__} = sub { dbgstore($@, Carp::longmess(@_)); };
 	}
+
+	$fp = DXLog::new('debug', 'dat', 'd');
 }
 
 sub dbgclose
 {
 	$SIG{__DIE__} = $SIG{__WARN__} = 'DEFAULT';
-	$fp->close();
+	$fp->close() if $fp;
+	undef $fp;
 }
 
 sub dbg
 {
 	my $l = shift;
-	if ($dbglevel{$l} || $l eq 'err') {
-	    my @in = @_;
-		my $t = time;
-		for (@in) {
-		    s/\n$//o;
-			s/\a//og;   # beeps
-			print "$_\n" if defined \*STDOUT;
-			$fp->writeunix($t, "$t^$_");
+	if ($fp && ($dbglevel{$l} || $l eq 'err')) {
+	    dbgstore(@_);
+	}
+}
+
+sub dbgdump
+{
+	my $l = shift;
+	my $m = shift;
+	if ($fp && ($dbglevel{$l} || $l eq 'err')) {
+		foreach my $l (@_) {
+			for (my $o = 0; $o < length $l; $o += 16) {
+				my $c = substr $l, $o, 16;
+				my $h = unpack "H*", $c;
+				$c =~ s/[\x00-\x1f\x7f-\xff]/./g;
+				my $left = 16 - length $c;
+				$h .= ' ' x (2 * $left) if $left > 0;
+				dbgstore($m . sprintf("%4d:", $o) . "$h $c");
+				$m = ' ' x (length $m);
+			}
 		}
 	}
 }