use constant FILE_TARGET => 0;
use constant STDERR_TARGET => 1;
-use POSIX qw(strftime);
+use POSIX qw(strftime getppid);
use Time::HiRes qw(gettimeofday tv_interval);
use YAML;
my ($dummy1, $self_filename, $self_line) = caller(0);
my $indent = " " x $self->{"calldepth"}++;
+ my $time = $self->get_request_time || '';
if (!defined($package)) {
- $self->_write('sub' . $level, $indent . "\\ top-level?\n");
+ $self->_write('sub' . $level, $indent . "\\ $time top-level?\n");
} else {
$self->_write('sub' . $level, $indent
- . "\\ ${subroutine} in "
+ . "\\ $time ${subroutine} in "
. "${self_filename}:${self_line} called from "
. "${filename}:${line}\n");
}
my ($dummy1, $self_filename, $self_line) = caller(0);
my $indent = " " x --$self->{"calldepth"};
+ my $time = $self->want_request_timer ? $self->get_request_time : '';
if (!defined($package)) {
- $self->_write('sub' . $level, $indent . "/ top-level?\n");
+ $self->_write('sub' . $level, $indent . "/ $time top-level?\n");
} else {
- $self->_write('sub' . $level, $indent . "/ ${subroutine} in " . "${self_filename}:${self_line}\n");
+ $self->_write('sub' . $level, $indent . "/ $time ${subroutine} in " . "${self_filename}:${self_line}\n");
}
return 1;
}
sub _write {
my ($self, $prefix, $message) = @_;
- my $date = strftime("%Y-%m-%d %H:%M:%S $$ ${prefix}: ", localtime(time()));
+ my $date = strftime("%Y-%m-%d %H:%M:%S $$ [" . getppid() . "] ${prefix}: ", localtime(time()));
local *FILE;
chomp($message);
sub begin_request {
my $self = shift;
- return 1 unless ($global_level & REQUEST_TIMER);
- $self->{request_start} = [gettimeofday];
+ return 1 unless want_request_timer();
+ $self->set_request_timer;
}
sub end_request {
my $self = shift;
- return 1 unless ($global_level & REQUEST_TIMER);
- $self->_write("time", tv_interval($self->{request_start}));
+ return 1 unless want_request_timer();
+ $self->_write("time", $self->get_request_time);
$self->{calldepth} = 0;
}
+sub get_request_time {
+ my $self = shift;
+ return $self->want_request_timer && $self->{request_start} ? tv_interval($self->{request_start}) : undef;
+}
+
+sub set_request_timer {
+ my $self = shift;
+ $self->{request_start} = [gettimeofday];
+}
+
+sub want_request_timer {
+ $global_level & REQUEST_TIMER;
+}
+
1;