$MAIL_IN = Linux::Inotify2::IN_MOVED_TO() |
Linux::Inotify2::IN_CREATE();
$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();
$ino_cls = 'PublicInbox::KQNotify';
} else {
sub new {
my ($class, $dirs, $cb) = @_;
- my $self = bless {}, $class;
+ 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;
+ $inot->watch($_, $MAIL_IN) for @$dirs;
$self->{inot} = $inot;
+ PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
$self;
}
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;