X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=766dacbd2a01187c35941cfc1e047d164ab1d799;hb=b67b50de92dbf61ce939b42f7c74e30dc58eba41;hp=632602313238c659c416fdafb1a5cb8163833efa;hpb=97315924f561c56cef3b581691409d4217f5c1b5;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 63260231..766dacbd 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,25 +11,57 @@ package DXDebug;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist isdbg dbgclose);
-@EXPORT_OK = qw(dbginit dbg dbgadd dbgsub dbglist isdbg dbgclose);
+@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;
+use Carp ();
 
 %dbglevel = ();
-$fp = DXLog::new('debug', 'dat', 'd');
+$fp = undef;
 
-sub _store
+# 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::dbgstore(\$@, Carp::shortmess(\@_));
+	    exit(-1); 
+	}
+	sub croak { 
+		\$SIG{__DIE__} = 'DEFAULT'; 
+        DXDebug::dbgstore(\$@, Carp::longmess(\@_));
+		exit(-1); 
+	}
+	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 croak { Carp::croak(\@_); }; 
+			 sub cluck { Carp::cluck(\@_); }; 
+   );
+} 
+
+
+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^$_"); 
+		}
 	}
 }
 
@@ -37,27 +69,43 @@ sub dbginit
 {
 	# add sig{__DIE__} handling
 	if (!defined $DB::VERSION) {
-		$SIG{__WARN__} = $SIG{__DIE__} = \&_store;
+		$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}) {
-	    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);
+			}
 		}
 	}
 }
@@ -90,5 +138,23 @@ sub isdbg
 	my $s = shift;
 	return $dbglevel{$s};
 }
+
+sub shortmess 
+{
+	return Carp::shortmess(@_);
+}
+
+sub longmess 
+{ 
+	return Carp::longmess(@_);
+}
+
 1;
 __END__
+
+
+
+
+
+
+