{dir,inbox}idle: use level-triggered epoll

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

diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm
index 5142d005e4aa326543fe8a99dca0c4e491eb42c5..c9a293e9355a222bf3416fcd4617b3276d41cded 100644 (file)
--- a/lib/PublicInbox/DirIdle.pm
+++ b/lib/PublicInbox/DirIdle.pm
@@ -5,7 +5,7 @@
 package PublicInbox::DirIdle;
 use strict;
 use parent 'PublicInbox::DS';
-use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+use PublicInbox::Syscall qw(EPOLLIN);
 use PublicInbox::In2Tie;
 
 my ($MAIL_IN, $MAIL_GONE, $ino_cls);
@@ -38,7 +38,7 @@ sub new {
        if ($ino_cls) {
                $inot = $ino_cls->new or die "E: $ino_cls->new: $!";
                my $io = PublicInbox::In2Tie::io($inot);
-               $self->SUPER::new($io, EPOLLIN | EPOLLET);
+               $self->SUPER::new($io, EPOLLIN);
        } else {
                require PublicInbox::FakeInotify;
                $inot = PublicInbox::FakeInotify->new; # starts timer
@@ -53,6 +53,26 @@ sub new {
        $self;
 }
 
+sub add_watches {
+       my ($self, $dirs, $gone) = @_;
+       my $fl = $MAIL_IN | ($gone ? $MAIL_GONE : 0);
+       my @ret;
+       for my $d (@$dirs) {
+               my $w = $self->{inot}->watch($d, $fl) or next;
+               push @ret, $w;
+       }
+       PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
+       @ret
+}
+
+sub rm_watches {
+       my ($self, $dir) = @_;
+       my $inot = $self->{inot};
+       if (my $cb = $inot->can('rm_watches')) { # TODO for fake watchers
+               $cb->($inot, $dir);
+       }
+}
+
 sub event_step {
        my ($self) = @_;
        my $cb = $self->{cb};
@@ -64,4 +84,15 @@ sub event_step {
        warn "$self->{inot}->read err: $@\n" if $@;
 }
 
+sub force_close {
+       my ($self) = @_;
+       my $inot = delete $self->{inot} // return;
+       if ($inot->can('fh')) { # Linux::Inotify2 2.3+
+               close($inot->fh) or warn "CLOSE ERROR: $!";
+       } elsif ($inot->isa('Linux::Inotify2')) {
+               require PublicInbox::LI2Wrap;
+               PublicInbox::LI2Wrap::wrapclose($inot);
+       }
+}
+
 1;