standardize timer-related event-loop code

[public-inbox.git] / lib / PublicInbox / HTTP.pm

diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 104a2132ba6108b92b9a5764d46a2b820234a7ee..00c9a0444bf75e63689d60893d6b3e236c1ca264 100644 (file)
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -26,13 +26,22 @@ use constant {
 
 # FIXME: duplicated code with NNTP.pm
 my $WEAKEN = {}; # string(inbox) -> inbox
-my $WEAKTIMER;
+my $weakt;
 sub weaken_task () {
-       $WEAKTIMER = undef;
+       $weakt = undef;
        $_->weaken_all for values %$WEAKEN;
        $WEAKEN = {};
 }
 
+my $pipelineq = [];
+my $pipet;
+sub process_pipelineq () {
+       my $q = $pipelineq;
+       $pipet = undef;
+       $pipelineq = [];
+       rbuf_process($_) foreach @$q;
+}
+
 # Use the same configuration parameter as git since this is primarily
 # a slow-client sponge for git-http-backend
 # TODO: support per-respository http.maxRequestBuffer somehow...
@@ -234,7 +243,7 @@ sub response_write {
                if (my $obj = $env->{'pi-httpd.inbox'}) {
                        # grace period for reaping resources
                        $WEAKEN->{"$obj"} = $obj;
-                       $WEAKTIMER ||= Danga::Socket->AddTimer(60, *weaken_task);
+                       $weakt ||= PublicInbox::EvCleanup::later(*weaken_task);
                }
                $self->{env} = undef;
        };
@@ -281,15 +290,6 @@ sub more ($$) {
        $self->write($_[1]);
 }
 
-my $pipelineq = [];
-my $next_tick;
-sub process_pipelineq () {
-       $next_tick = undef;
-       my $q = $pipelineq;
-       $pipelineq = [];
-       rbuf_process($_) foreach @$q;
-}
-
 # overrides existing Danga::Socket method
 sub event_write {
        my ($self) = @_;
@@ -300,7 +300,7 @@ sub event_write {
                $self->watch_read(1);
        } else { # avoid recursion for pipelined requests
                push @$pipelineq, $self;
-               $next_tick ||= Danga::Socket->AddTimer(0, *process_pipelineq);
+               $pipet ||= PublicInbox::EvCleanup::asap(*process_pipelineq);
        }
 }