X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=14f8dbd2a06ad753c559d3ed9c2cb56a52d8045b;hb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;hp=766dacbd2a01187c35941cfc1e047d164ab1d799;hpb=ca8e84c32e70ea8eb1f30e716b7dbdc92f7e5083;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 766dacbd..14f8dbd2 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,10 +11,10 @@ package DXDebug;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbgstore dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck);
+@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);
 
 use DXUtil;
 use DXLog ();
@@ -22,6 +22,7 @@ use Carp ();
 
 %dbglevel = ();
 $fp = undef;
+$callback = undef;
 
 # Avoid generating "subroutine redefined" warnings with the following
 # hack (from CGI::Carp):
@@ -29,29 +30,33 @@ if (!defined $DB::VERSION) {
 	local $^W=0;
 	eval qq( sub confess { 
 	    \$SIG{__DIE__} = 'DEFAULT'; 
-        DXDebug::dbgstore(\$@, Carp::shortmess(\@_));
+        DXDebug::dbg(\$@);
+		DXDebug::dbg(Carp::shortmess(\@_));
 	    exit(-1); 
 	}
 	sub croak { 
 		\$SIG{__DIE__} = 'DEFAULT'; 
-        DXDebug::dbgstore(\$@, Carp::longmess(\@_));
+        DXDebug::dbg(\$@);
+		DXDebug::dbg(Carp::longmess(\@_));
 		exit(-1); 
 	}
-	sub carp    { DXDebug::dbgstore(Carp::shortmess(\@_)); }
-	sub cluck   { DXDebug::dbgstore(Carp::longmess(\@_)); } 
+	sub carp    { DXDebug::dbg(Carp::shortmess(\@_)); }
+	sub cluck   { DXDebug::dbg(Carp::longmess(\@_)); } 
 	);
 
     CORE::die(Carp::shortmess($@)) if $@;
 } else {
-    eval qq( sub confess { Carp::confess(\@_); }; 
-			 sub croak { Carp::croak(\@_); }; 
-			 sub cluck { Carp::cluck(\@_); }; 
+    eval qq( sub confess { die Carp::longmess(\@_); }; 
+			 sub croak { die Carp::shortmess(\@_); }; 
+			 sub cluck { warn Carp::longmess(\@_); }; 
+			 sub carp { warn Carp::shortmess(\@_); }; 
    );
 } 
 
 
-sub dbgstore
+sub dbg($)
 {
+	return unless $fp;
 	my $t = time; 
 	for (@_) {
 		my $r = $_;
@@ -60,17 +65,31 @@ sub dbgstore
 		for (@l) {
 			s/([\x00-\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
 			print "$_\n" if defined \*STDOUT;
-			$fp->writeunix($t, "$t^$_"); 
+			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__} = sub { dbgstore($@, Carp::shortmess(@_)); };
-		$SIG{__DIE__} = sub { dbgstore($@, Carp::longmess(@_)); };
+		$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');
@@ -83,14 +102,6 @@ sub dbgclose
 	undef $fp;
 }
 
-sub dbg
-{
-	my $l = shift;
-	if ($fp && ($dbglevel{$l} || $l eq 'err')) {
-	    dbgstore(@_);
-	}
-}
-
 sub dbgdump
 {
 	my $l = shift;
@@ -103,7 +114,7 @@ sub dbgdump
 				$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");
+				dbg($m . sprintf("%4d:", $o) . "$h $c");
 				$m = ' ' x (length $m);
 			}
 		}
@@ -133,10 +144,10 @@ sub dbglist
 	return keys (%dbglevel);
 }
 
-sub isdbg
+sub isdbg($)
 {
-	my $s = shift;
-	return $dbglevel{$s};
+	return unless $fp;
+	return $dbglevel{$_[0]};
 }
 
 sub shortmess