dir_idle: treat IN_MOVED_FROM as a gone event

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

diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm
index 7031e5fd5615f17aa1df4467c6aebdcf36d7c31a..9206da9cb710186462ffefd10cb4af0764f7e615 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);
@@ -14,7 +14,8 @@ if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
                Linux::Inotify2::IN_CREATE();
        $MAIL_GONE = Linux::Inotify2::IN_DELETE() |
                        Linux::Inotify2::IN_DELETE_SELF() |
-                       Linux::Inotify2::IN_MOVE_SELF();
+                       Linux::Inotify2::IN_MOVE_SELF() |
+                       Linux::Inotify2::IN_MOVED_FROM();
        $ino_cls = 'Linux::Inotify2';
 # Perl 5.22+ is needed for fileno(DIRHANDLE) support:
 } elsif ($^V ge v5.22 && eval { require PublicInbox::KQNotify }) {
@@ -32,34 +33,31 @@ if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
 }
 
 sub new {
-       my ($class, $dirs, $cb, $gone) = @_;
+       my ($class, $cb) = @_;
        my $self = bless { cb => $cb }, $class;
        my $inot;
        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
        }
-
-       # Linux::Inotify2->watch or similar
-       my $fl = $MAIL_IN;
-       $fl |= $MAIL_GONE if $gone;
-       $inot->watch($_, $fl) for @$dirs;
        $self->{inot} = $inot;
-       PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
        $self;
 }
 
 sub add_watches {
        my ($self, $dirs, $gone) = @_;
        my $fl = $MAIL_IN | ($gone ? $MAIL_GONE : 0);
+       my @ret;
        for my $d (@$dirs) {
-               $self->{inot}->watch($d, $fl);
+               my $w = $self->{inot}->watch($d, $fl) or next;
+               push @ret, $w;
        }
        PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
+       @ret
 }
 
 sub rm_watches {
@@ -81,4 +79,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;