update copyrights for 2018

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

diff --git a/lib/PublicInbox/EvCleanup.pm b/lib/PublicInbox/EvCleanup.pm
index 61837b89d05c4410334810da5cafd2d399dc090a..559730e980d528d55f065dfbc9338aa630125d57 100644 (file)
--- a/lib/PublicInbox/EvCleanup.pm
+++ b/lib/PublicInbox/EvCleanup.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # event cleanups (currently for Danga::Socket)
@@ -9,6 +9,7 @@ use base qw(Danga::Socket);
 use fields qw(rd);
 my $singleton;
 my $asapq = [ [], undef ];
+my $nextq = [ [], undef ];
 my $laterq = [ [], undef ];
 
 sub once_init () {
@@ -29,8 +30,19 @@ sub _run_all ($) {
        $_->() foreach @$run;
 }
 
+# ensure Danga::Socket::ToClose fires after timers fire
+sub _asap_close () { $asapq->[1] ||= _asap_timer() }
+
 sub _run_asap () { _run_all($asapq) }
-sub _run_later () { _run_all($laterq) }
+sub _run_next () {
+       _run_all($nextq);
+       _asap_close();
+}
+
+sub _run_later () {
+       _run_all($laterq);
+       _asap_close();
+}
 
 # Called by Danga::Socket
 sub event_write {
@@ -51,6 +63,12 @@ sub asap ($) {
        $asapq->[1] ||= _asap_timer();
 }
 
+sub next_tick ($) {
+       my ($cb) = @_;
+       push @{$nextq->[0]}, $cb;
+       $nextq->[1] ||= Danga::Socket->AddTimer(0, *_run_next);
+}
+
 sub later ($) {
        my ($cb) = @_;
        push @{$laterq->[0]}, $cb;
@@ -59,6 +77,7 @@ sub later ($) {
 
 END {
        _run_asap();
+       _run_next();
        _run_later();
 }