byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small performance improvement for logging and config hooks which don't need full continuation support

Browse Source 
DashProfiler support (commented out)


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@839 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2008-01-30 18:35:32 +00:00
parent 67ffd9fb98
commit 238eb79841
1 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Qpsmtpd.pm
View File

@ -1,10 +1,12 @@
package Qpsmtpd; package Qpsmtpd;
use strict; use strict;
use vars qw($VERSION $Logger $TraceLevel $Spool_dir $Size_threshold); use vars qw($VERSION $TraceLevel $Spool_dir $Size_threshold);
use Sys::Hostname; use Sys::Hostname;
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
#use DashProfiler;
$VERSION = "0.42rc1"; $VERSION = "0.42rc1";
my $hooks = {}; my $hooks = {};
@ -15,6 +17,13 @@ my %defaults = (
my $_config_cache = {}; my $_config_cache = {};
clear_config_cache(); clear_config_cache();
#DashProfiler->add_profile("qpsmtpd");
#my $SAMPLER = DashProfiler->prepare("qpsmtpd");
sub DESTROY {
#warn $_ for DashProfiler->profile_as_text("qpsmtpd");
}
sub version { $VERSION }; sub version { $VERSION };
sub TRACE_LEVEL { $TraceLevel }; # leave for plugin compatibility sub TRACE_LEVEL { $TraceLevel }; # leave for plugin compatibility
@ -87,7 +96,7 @@ sub varlog {
$self->load_logging; # in case we already don't have this loaded yet $self->load_logging; # in case we already don't have this loaded yet
my ($rc) = $self->run_hooks("logging", $trace, $hook, $plugin, @log); my ($rc) = $self->run_hooks_no_respond("logging", $trace, $hook, $plugin, @log);
unless ( $rc and $rc == DECLINED or $rc == OK ) { unless ( $rc and $rc == DECLINED or $rc == OK ) {
# no logging plugins registered so fall back to STDERR # no logging plugins registered so fall back to STDERR
@ -114,13 +123,14 @@ sub clear_config_cache {
sub config { sub config {
my ($self, $c, $type) = @_; my ($self, $c, $type) = @_;
#my $timer = $SAMPLER->("config", undef, 1);
if ($_config_cache->{$c}) { if ($_config_cache->{$c}) {
return wantarray ? @{$_config_cache->{$c}} : $_config_cache->{$c}->[0]; return wantarray ? @{$_config_cache->{$c}} : $_config_cache->{$c}->[0];
} }
#warn "SELF->config($c) ", ref $self; #warn "SELF->config($c) ", ref $self;
my ($rc, @config) = $self->run_hooks("config", $c); my ($rc, @config) = $self->run_hooks_no_respond("config", $c);
@config = () unless $rc == OK; @config = () unless $rc == OK;
if (wantarray) { if (wantarray) {
@ -370,8 +380,27 @@ sub run_hooks {
return $self->hook_responder($hook, [0, ''], [@_]); return $self->hook_responder($hook, [0, ''], [@_]);
} }
sub run_hooks_no_respond {
my ($self, $hook) = (shift, shift);
if ($hooks->{$hook}) {
my @r;
for my $code (@{$hooks->{$hook}}) {
eval { (@r) = $code->{code}->($self, $self->transaction, @_); };
$@ and warn("FATAL PLUGIN ERROR: ", $@) and next;
if ($r[0] == YIELD) {
die "YIELD not valid from $hook hook";
}
last unless $r[0] == DECLINED;
}
$r[0] = DECLINED if not defined $r[0];
return @r;
}
return (0, '');
}
sub run_continuation { sub run_continuation {
my $self = shift; my $self = shift;
#my $t1 = $SAMPLER->("run_hooks", undef, 1);
die "No continuation in progress" unless $self->{_continuation}; die "No continuation in progress" unless $self->{_continuation};
$self->continue_read() if $self->isa('Danga::Client'); $self->continue_read() if $self->isa('Danga::Client');
my $todo = $self->{_continuation}; my $todo = $self->{_continuation};
@ -381,6 +410,8 @@ sub run_continuation {
my @r; my @r;
while (@$todo) { while (@$todo) {
my $code = shift @$todo; my $code = shift @$todo;
#my $t2 = $SAMPLER->($hook . "_" . $code->{name}, undef, 1);
#warn("Got sampler called: ${hook}_$code->{name}\n");
if ( $hook eq 'logging' ) { # without calling $self->log() if ( $hook eq 'logging' ) { # without calling $self->log()
eval { (@r) = $code->{code}->($self, $self->transaction, @$args); }; eval { (@r) = $code->{code}->($self, $self->transaction, @$args); };
$@ and warn("FATAL LOGGING PLUGIN ERROR: ", $@) and next; $@ and warn("FATAL LOGGING PLUGIN ERROR: ", $@) and next;
@ -417,13 +448,13 @@ sub run_continuation {
$r[1] = "" if not defined $r[1]; $r[1] = "" if not defined $r[1];
$self->log(LOGDEBUG, "Plugin ".$code->{name}. $self->log(LOGDEBUG, "Plugin ".$code->{name}.
", hook $hook returned ".return_code($r[0]).", $r[1]"); ", hook $hook returned ".return_code($r[0]).", $r[1]");
$self->run_hooks("deny", $code->{name}, $r[0], $r[1]) unless ($hook eq "deny"); $self->run_hooks_no_respond("deny", $code->{name}, $r[0], $r[1]) unless ($hook eq "deny");
} }
else { else {
$r[1] = "" if not defined $r[1]; $r[1] = "" if not defined $r[1];
$self->log(LOGDEBUG, "Plugin ".$code->{name}. $self->log(LOGDEBUG, "Plugin ".$code->{name}.
", hook $hook returned ".return_code($r[0]).", $r[1]"); ", hook $hook returned ".return_code($r[0]).", $r[1]");
$self->run_hooks("ok", $code->{name}, $r[0], $r[1]) unless ($hook eq "ok"); $self->run_hooks_no_respond("ok", $code->{name}, $r[0], $r[1]) unless ($hook eq "ok");
} }
} }
@ -438,6 +469,8 @@ sub run_continuation {
sub hook_responder { sub hook_responder {
my ($self, $hook, $msg, $args) = @_; my ($self, $hook, $msg, $args) = @_;
#my $t1 = $SAMPLER->("hook_responder", undef, 1);
my $code = shift @$msg; my $code = shift @$msg;
my $responder = $hook . '_respond'; my $responder = $hook . '_respond';