X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=766dacbd2a01187c35941cfc1e047d164ab1d799;hb=42032b193f4411c08979c2cd8d1f39818d5de235;hp=a1c63407f71f1b2aba38c58782dbe77f0a73e63b;hpb=8e45a3dac2e136dc0c9d6f1e78f8c048a8d7ba21;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index a1c63407..766dacbd 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,17 +11,17 @@ 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);
 
 use strict;
 use vars qw(%dbglevel $fp);
 
 use DXUtil;
 use DXLog ();
-use Carp qw(cluck);
+use Carp ();
 
 %dbglevel = ();
-$fp = DXLog::new('debug', 'dat', 'd');
+$fp = undef;
 
 # Avoid generating "subroutine redefined" warnings with the following
 # hack (from CGI::Carp):
@@ -29,33 +29,36 @@ if (!defined $DB::VERSION) {
 	local $^W=0;
 	eval qq( sub confess { 
 	    \$SIG{__DIE__} = 'DEFAULT'; 
-        DXDebug::_store(\$@, Carp::shortmess(\@_));
+        DXDebug::dbgstore(\$@, Carp::shortmess(\@_));
 	    exit(-1); 
 	}
 	sub croak { 
 		\$SIG{__DIE__} = 'DEFAULT'; 
-        DXDebug::_store(\$@, Carp::longmess(\@_));
+        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 croak { Carp::croak(\@_); }; 
+			 sub cluck { Carp::cluck(\@_); }; 
    );
 } 
 
 
-sub _store
+sub dbgstore
 {
 	my $t = time; 
 	for (@_) {
-		chomp;
-		my @l = split /\n/;
+		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^$_"); 
 		}
@@ -66,28 +69,43 @@ sub dbginit
 {
 	# add sig{__DIE__} handling
 	if (!defined $DB::VERSION) {
-		$SIG{__WARN__} = sub { _store($@, Carp::shortmess(@_)); };
-		$SIG{__DIE__} = sub { _store($@, Carp::longmess(@_)); };
+		$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);
+			}
 		}
 	}
 }