You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2009/12/04 17:24:37 UTC
svn commit: r887254 - /spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm
Author: mmartinec
Date: Fri Dec 4 16:24:36 2009
New Revision: 887254
URL: http://svn.apache.org/viewvc?rev=887254&view=rev
Log:
comments changed in Timeout.pm
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm?rev=887254&r1=887253&r2=887254&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm Fri Dec 4 16:24:36 2009
@@ -186,6 +186,7 @@
# dbg("timed: %s restoring outer alarm(%.3f)", $id,$oldalarm);
alarm($oldalarm);
$ret = &$sub;
+ # dbg("timed: %s post-sub(outer)", $id);
} else {
local $SIG{ALRM} = $handler; # ensure closed scope here
@@ -238,7 +239,7 @@
undef $return if $self->{timed_out};
my $remaining_time;
- if ($oldalarm) {
+ if ($oldalarm) { # an outer alarm was already active when we were called
$remaining_time = $start_time + $oldalarm - time;
if ($remaining_time > 0) { # still in the future
# restore the previously-active alarm,
@@ -310,7 +311,7 @@
alarm($isecs);
} else {
$self->{timed_out} = 1;
- # dbg("timed: %s reset, outer timer expired %.3f s ago", $id, -$secs);
+ # dbg("timed: %s reset, timer expired %.3f s ago", $id, -$secs);
alarm(2); # mercifully grant two additional seconds
# my $prev_handler = $SIG{ALRM};
# if (ref $prev_handler eq 'CODE') {