projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix merge command
[spider.git]
/
perl
/
DXDebug.pm
diff --git
a/perl/DXDebug.pm
b/perl/DXDebug.pm
index 790b398d1666d73c431f58d9560ae8ba50c1caee..4b8d4f250575ed198ec5357db1ba7b88c2dd3a8e 100644
(file)
--- a/
perl/DXDebug.pm
+++ b/
perl/DXDebug.pm
@@
-11,14
+11,14
@@
package DXDebug;
require Exporter;
@ISA = qw(Exporter);
require Exporter;
@ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbg
store dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluc
k cluck);
+@EXPORT = qw(dbginit dbg
dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croa
k cluck);
use strict;
use vars qw(%dbglevel $fp);
use DXUtil;
use DXLog ();
use strict;
use vars qw(%dbglevel $fp);
use DXUtil;
use DXLog ();
-use Carp
qw(cluck
);
+use Carp
(
);
%dbglevel = ();
$fp = undef;
%dbglevel = ();
$fp = undef;
@@
-29,28
+29,33
@@
if (!defined $DB::VERSION) {
local $^W=0;
eval qq( sub confess {
\$SIG{__DIE__} = 'DEFAULT';
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';
exit(-1);
}
sub croak {
\$SIG{__DIE__} = 'DEFAULT';
- DXDebug::dbgstore(\$@, Carp::longmess(\@_));
+ DXDebug::dbg(\$@);
+ DXDebug::dbg(Carp::longmess(\@_));
exit(-1);
}
exit(-1);
}
- sub carp { DXDebug::dbg
store
(Carp::shortmess(\@_)); }
- sub cluck { DXDebug::dbg
store
(Carp::longmess(\@_)); }
+ sub carp { DXDebug::dbg(Carp::shortmess(\@_)); }
+ sub cluck { DXDebug::dbg(Carp::longmess(\@_)); }
);
CORE::die(Carp::shortmess($@)) if $@;
} else {
);
CORE::die(Carp::shortmess($@)) if $@;
} else {
- eval qq( sub confess { Carp::confess(\@_); };
- 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 dbg
store
+sub dbg
($)
{
{
+ return unless $fp;
my $t = time;
for (@_) {
my $r = $_;
my $t = time;
for (@_) {
my $r = $_;
@@
-68,8
+73,18
@@
sub dbginit
{
# add sig{__DIE__} handling
if (!defined $DB::VERSION) {
{
# 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');
}
$fp = DXLog::new('debug', 'dat', 'd');
@@
-82,14
+97,6
@@
sub dbgclose
undef $fp;
}
undef $fp;
}
-sub dbg
-{
- my $l = shift;
- if ($fp && ($dbglevel{$l} || $l eq 'err')) {
- dbgstore(@_);
- }
-}
-
sub dbgdump
{
my $l = shift;
sub dbgdump
{
my $l = shift;
@@
-102,7
+109,7
@@
sub dbgdump
$c =~ s/[\x00-\x1f\x7f-\xff]/./g;
my $left = 16 - length $c;
$h .= ' ' x (2 * $left) if $left > 0;
$c =~ s/[\x00-\x1f\x7f-\xff]/./g;
my $left = 16 - length $c;
$h .= ' ' x (2 * $left) if $left > 0;
- dbg
store
($m . sprintf("%4d:", $o) . "$h $c");
+ dbg($m . sprintf("%4d:", $o) . "$h $c");
$m = ' ' x (length $m);
}
}
$m = ' ' x (length $m);
}
}
@@
-132,10
+139,10
@@
sub dbglist
return keys (%dbglevel);
}
return keys (%dbglevel);
}
-sub isdbg
+sub isdbg
($)
{
{
-
my $s = shift
;
- return $dbglevel{$
s
};
+
return unless $fp
;
+ return $dbglevel{$
_[0]
};
}
sub shortmess
}
sub shortmess