-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 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)
use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
use PublicInbox::In2Tie;
-my ($MAIL_IN, $ino_cls);
+my ($MAIL_IN, $MAIL_GONE, $ino_cls);
if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
$MAIL_IN = Linux::Inotify2::IN_MOVED_TO() |
Linux::Inotify2::IN_CREATE();
+ $MAIL_GONE = Linux::Inotify2::IN_DELETE() |
+ Linux::Inotify2::IN_DELETE_SELF() |
+ Linux::Inotify2::IN_MOVE_SELF();
$ino_cls = 'Linux::Inotify2';
-} elsif (eval { require PublicInbox::KQNotify }) {
+# Perl 5.22+ is needed for fileno(DIRHANDLE) support:
+} elsif ($^V ge v5.22 && eval { require PublicInbox::KQNotify }) {
$MAIL_IN = PublicInbox::KQNotify::MOVED_TO_OR_CREATE();
+ $MAIL_GONE = PublicInbox::KQNotify::NOTE_DELETE() |
+ PublicInbox::KQNotify::NOTE_REVOKE() |
+ PublicInbox::KQNotify::NOTE_RENAME();
$ino_cls = 'PublicInbox::KQNotify';
} else {
require PublicInbox::FakeInotify;
$MAIL_IN = PublicInbox::FakeInotify::MOVED_TO_OR_CREATE();
+ $MAIL_GONE = PublicInbox::FakeInotify::IN_DELETE() |
+ PublicInbox::FakeInotify::IN_DELETE_SELF() |
+ PublicInbox::FakeInotify::IN_MOVE_SELF();
}
sub new {
- my ($class, $dirs, $cb) = @_;
- my $self = bless {}, $class;
+ my ($class, $dirs, $cb, $gone) = @_;
+ my $self = bless { cb => $cb }, $class;
my $inot;
if ($ino_cls) {
$inot = $ino_cls->new or die "E: $ino_cls->new: $!";
}
# Linux::Inotify2->watch or similar
- $inot->watch($_, $MAIL_IN, $cb) for @$dirs;
+ 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);
+ for my $d (@$dirs) {
+ $self->{inot}->watch($d, $fl);
+ }
+ PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
+}
+
+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) = @_;
- eval { $self->{inot}->poll }; # Linux::Inotify2::poll
- warn "$self->{inot}->poll err: $@\n" if $@;
+ my $cb = $self->{cb};
+ local $PublicInbox::DS::in_loop = 0; # waitpid() synchronously
+ eval {
+ my @events = $self->{inot}->read; # Linux::Inotify2->read
+ $cb->($_) for @events;
+ };
+ warn "$self->{inot}->read err: $@\n" if $@;
}
1;