ds: set event flags directly at initialization

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

diff --git a/lib/PublicInbox/EvCleanup.pm b/lib/PublicInbox/EvCleanup.pm
index 1a2bdb294a6431a38cb79f7fa69273c6bbf19653..d60ac2cc8c88d3de63288c2d51d517b796e65c1d 100644 (file)
--- a/lib/PublicInbox/EvCleanup.pm
+++ b/lib/PublicInbox/EvCleanup.pm
@@ -1,12 +1,11 @@
 # 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)
+# event cleanups (currently for PublicInbox::DS)
 package PublicInbox::EvCleanup;
 use strict;
 use warnings;
-use base qw(Danga::Socket);
-use fields qw(rd);
+use base qw(PublicInbox::DS);
 
 my $ENABLED;
 sub enabled { $ENABLED }
@@ -24,8 +23,13 @@ sub once_init () {
        # 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->SUPER::new($w, 0);
+
+       # always writable, since PublicInbox::EvCleanup::event_step
+       # never drains wbuf.  We can avoid wasting a hash slot by
+       # stuffing the read-end of the pipe into the never-to-be-touched
+       # wbuf
+       $self->{wbuf} = $r;
        $self;
 }
 
@@ -38,7 +42,7 @@ sub _run_all ($) {
        $_->() foreach @$run;
 }
 
-# ensure Danga::Socket::ToClose fires after timers fire
+# ensure PublicInbox::DS::ToClose processing after timers fire
 sub _asap_close () { $asapq->[1] ||= _asap_timer() }
 
 sub _run_asap () { _run_all($asapq) }
@@ -52,8 +56,8 @@ sub _run_later () {
        _asap_close();
 }
 
-# Called by Danga::Socket
-sub event_write {
+# Called by PublicInbox::DS
+sub event_step {
        my ($self) = @_;
        $self->watch_write(0);
        _run_asap();
@@ -74,13 +78,13 @@ sub asap ($) {
 sub next_tick ($) {
        my ($cb) = @_;
        push @{$nextq->[0]}, $cb;
-       $nextq->[1] ||= Danga::Socket->AddTimer(0, *_run_next);
+       $nextq->[1] ||= PublicInbox::DS->AddTimer(0, *_run_next);
 }
 
 sub later ($) {
        my ($cb) = @_;
        push @{$laterq->[0]}, $cb;
-       $laterq->[1] ||= Danga::Socket->AddTimer(60, *_run_later);
+       $laterq->[1] ||= PublicInbox::DS->AddTimer(60, *_run_later);
 }
 
 END {