X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=b42db66dfb4934dd9744b2f9c6fcd00f1b77e8be;hb=f155969d600561b9ef151a7ce2494a0c89aed033;hp=bc53457fe1d62d4d61338e78a1026daca03bb10f;hpb=b2e4d1c7378cfd98bd8cdf9304c2bd6e5d4b802c;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index bc53457f..b42db66d 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,62 +11,124 @@ package DXDebug;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist isdbg);
+@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist isdbg dbgclose confess croak cluck cluck);
 
 use strict;
-use vars qw(%dbglevel $dbgfh);
+use vars qw(%dbglevel $fp);
 
-use FileHandle;
 use DXUtil;
+use DXLog ();
+use Carp;
 
 %dbglevel = ();
-$dbgfh = "";
+$fp = DXLog::new('debug', 'dat', 'd');
 
-no strict 'refs';
+# 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); 
+	}
+	sub confess { 
+		\$SIG{__DIE__} = 'DEFAULT'; 
+		DXDebug::_store(Carp::shortmess(\@_)); 
+		exit(-1); 
+	}
+	sub carp    { DXDebug::_store(Carp::shortmess(\@_)); }
+	sub cluck   { DXDebug::_store(Carp::longmess(\@_)); } 
+	);
+
+    CORE::die(Carp::shortmess($@)) if $@;
+}
+
+
+sub _store
+{
+	my $t = time; 
+	for (@_) {
+		$fp->writeunix($t, "$t^$_"); 
+		print STDERR $_;
+	}
+}
 
 sub dbginit
 {
-  my $fhname = shift;
-  $dbgfh = new FileHandle;
-  $dbgfh->open(">>$fhname") or die "can't open debug file '$fhname' $!";
-  $dbgfh->autoflush(1);
+	# add sig{__DIE__} handling
+	if (!defined $DB::VERSION) {
+		$SIG{__WARN__} = sub { _store(Carp::shortmess(@_)); };
+		$SIG{__DIE__} = sub { _store(Carp::shortmess(@_)); };
+	}
+}
+
+sub dbgclose
+{
+	$SIG{__DIE__} = $SIG{__WARN__} = 'DEFAULT';
+	$fp->close();
 }
 
 sub dbg
 {
-  my $l = shift;
-  if ($dbglevel{$l}) {
-    print @_;
-	print $dbgfh atime, @_ if $dbgfh;
-  }
+	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^$_");
+		}
+	}
 }
 
 sub dbgadd
 { 
-  my $entry;
-  
-  foreach $entry (@_) {
-    $dbglevel{$entry} = 1;
-  }
+	my $entry;
+	
+	foreach $entry (@_) {
+		$dbglevel{$entry} = 1;
+	}
 }
 
 sub dbgsub
 {
-  my $entry;
-
-  foreach $entry (@_) {
-    delete $dbglevel{entry};
-  }
+	my $entry;
+	
+	foreach $entry (@_) {
+		delete $dbglevel{$entry};
+	}
 }
 
 sub dbglist
 {
-  return keys (%dbglevel);
+	return keys (%dbglevel);
 }
 
 sub isdbg
 {
-  return $dbglevel{shift};
+	my $s = shift;
+	return $dbglevel{$s};
+}
+
+sub shortmess 
+{
+	return Carp::shortmess(@_);
+}
+
+sub longmess 
+{ 
+	return Carp::longmess(@_);
 }
+
 1;
 __END__
+
+
+
+
+
+
+