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

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 63260231..40cb3a25 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,53 +11,114 @@ 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 dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck);
 
 use strict;
-use vars qw(%dbglevel $fp);
+use vars qw(%dbglevel $fp $callback $cleandays $keepdays);
 
 use DXUtil;
 use DXLog ();
-use Carp;
+use Carp ();
 
 %dbglevel = ();
-$fp = DXLog::new('debug', 'dat', 'd');
+$fp = undef;
+$callback = undef;
+$keepdays = 10;
+$cleandays = 100;
 
-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::dbg(\$@);
+		DXDebug::dbg(Carp::shortmess(\@_));
+	    exit(-1); 
+	}
+	sub croak { 
+		\$SIG{__DIE__} = 'DEFAULT'; 
+        DXDebug::dbg(\$@);
+		DXDebug::dbg(Carp::longmess(\@_));
+		exit(-1); 
+	}
+	sub carp    { DXDebug::dbg(Carp::shortmess(\@_)); }
+	sub cluck   { DXDebug::dbg(Carp::longmess(\@_)); } 
+	);
+
+    CORE::die(Carp::shortmess($@)) if $@;
+} else {
+    eval qq( sub confess { die Carp::longmess(\@_); }; 
+			 sub croak { die Carp::shortmess(\@_); }; 
+			 sub cluck { warn Carp::longmess(\@_); }; 
+			 sub carp { warn Carp::shortmess(\@_); }; 
+   );
+} 
+
+
+sub dbg($)
 {
+	return unless $fp;
 	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;
+			my $str = "$t^$_";
+			&$callback($str) if $callback;
+			$fp->writeunix($t, $str); 
+		}
 	}
 }
 
 sub dbginit
 {
+	$callback = shift;
+	
 	# add sig{__DIE__} handling
 	if (!defined $DB::VERSION) {
-		$SIG{__WARN__} = $SIG{__DIE__} = \&_store;
+		$SIG{__WARN__} = sub { 
+			if ($_[0] =~ /Deep\s+recursion/i) {
+				dbg($@);
+				dbg(Carp::longmess(@_)); 
+				CORE::die;
+			} else { 
+				dbg($@);
+				dbg(Carp::shortmess(@_));
+			}
+		};
+		
+		$SIG{__DIE__} = sub { dbg($@); dbg(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
+sub dbgdump
 {
 	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^$_");
+	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;
+				dbg($m . sprintf("%4d:", $o) . "$h $c");
+				$m = ' ' x (length $m);
+			}
 		}
 	}
 }
@@ -85,10 +146,46 @@ sub dbglist
 	return keys (%dbglevel);
 }
 
-sub isdbg
+sub isdbg($)
+{
+	return unless $fp;
+	return $dbglevel{$_[0]};
+}
+
+sub shortmess 
+{
+	return Carp::shortmess(@_);
+}
+
+sub longmess 
+{ 
+	return Carp::longmess(@_);
+}
+
+# clean out old debug files, stop when you get a gap of more than a month
+sub dbgclean
 {
-	my $s = shift;
-	return $dbglevel{$s};
+	my $date = $fp->unixtoj($main::systime)->sub($keepdays+1);
+	my $i = 0;
+
+	while ($i < 31) {
+		my $fn = $fp->_genfn($date);
+		if (-e $fn) {
+			unlink $fn;
+			$i = 0;
+		} else {
+			$i++;
+		}
+		$date = $date->sub(1);
+	}
 }
+
 1;
 __END__
+
+
+
+
+
+
+