1. cluster seems to have a memory leak, put DESTROY functions in where

[spider.git] / perl / DXDebug.pm

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 530f3b21a532b7305767fcbe46f1081c57475d72..df3cb02741cef0d31b606a411358cfa4a3376de9 100644 (file)
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,8 +11,8 @@ package DXDebug;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbg dbgadd dbgsub dbglist isdbg);
-@EXPORT_OK = qw(dbg dbgadd dbgsub dbglist isdbg);
+@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist isdbg dbgclose);
+@EXPORT_OK = qw(dbginit dbg dbgadd dbgsub dbglist isdbg dbgclose);
 
 use strict;
 use vars qw(%dbglevel $fp);
@@ -25,17 +25,41 @@ use Carp;
 %dbglevel = ();
 $fp = DXLog::new('debug', 'dat', 'd');
 
+sub _store
+{
+       my $t = time; 
+       for (@_) {
+               $fp->writeunix($t, "$t^$_"); 
+               print STDERR $_;
+       }
+}
+
+sub dbginit
+{
+       # add sig{__DIE__} handling
+       if (!defined $DB::VERSION) {
+               $SIG{__WARN__} = $SIG{__DIE__} = \&_store;
+       }
+}
+
+sub dbgclose
+{
+       $SIG{__DIE__} = $SIG{__WARN__} = 'DEFAULT';
+       $fp->close();
+}
+
 sub dbg
 {
        my $l = shift;
        if ($dbglevel{$l}) {
-               for (@_) {
-                       s/\n$//og;
+           my @in = @_;
+               my $t = time;
+               for (@in) {
+                   s/\n$//o;
                        s/\a//og;   # beeps
+                       print "$_\n" if defined \*STDOUT;
+                       $fp->writeunix($t, "$t^$_");
                }
-               print "@_\n" if defined \*STDOUT;
-               my $t = time;
-               $fp->writeunix($t, "$t^@_");
        }
 }
 
@@ -64,7 +88,8 @@ sub dbglist
 
 sub isdbg
 {
-       return $dbglevel{shift};
+       my $s = shift;
+       return $dbglevel{$s};
 }
 1;
 __END__