-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# Used by public-inbox-watch for Maildir (and possibly MH in the future)
package PublicInbox::DirIdle;
-use strict;
+use v5.12;
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);
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 }) {
}
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;
}
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;