Merge remote-tracking branch 'origin/purge'

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

diff --git a/lib/PublicInbox/EvCleanup.pm b/lib/PublicInbox/EvCleanup.pm
index 61837b89d05c4410334810da5cafd2d399dc090a..1a2bdb294a6431a38cb79f7fa69273c6bbf19653 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)
@@ -7,14 +7,23 @@ use strict;
 use warnings;
 use base qw(Danga::Socket);
 use fields qw(rd);
+
+my $ENABLED;
+sub enabled { $ENABLED }
+sub enable { $ENABLED = 1 }
 my $singleton;
 my $asapq = [ [], undef ];
+my $nextq = [ [], undef ];
 my $laterq = [ [], undef ];
 
 sub once_init () {
        my $self = fields::new('PublicInbox::EvCleanup');
        my ($r, $w);
+
+       # This is a dummy pipe which is always writable so it can always
+       # fires in the next event loop iteration.
        pipe($r, $w) or die "pipe: $!";
+       fcntl($w, 1031, 4096) if $^O eq 'linux'; # 1031: F_SETPIPE_SZ
        $self->SUPER::new($w);
        $self->{rd} = $r; # never read, since we never write..
        $self;
@@ -29,8 +38,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 +71,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,7 +85,8 @@ sub later ($) {
 
 END {
        _run_asap();
-       _run_later();
+       _run_all($nextq);
+       _run_all($laterq);
 }
 
 1;