rename {pi_config} fields to {pi_cfg}

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

diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm
index ffceda66530b73d9a75abf162b60faaea565f0a5..458285e24d72732e539d0f4a6f1f5d52849af266 100644 (file)
--- a/lib/PublicInbox/DirIdle.pm
+++ b/lib/PublicInbox/DirIdle.pm
@@ -4,8 +4,7 @@
 # Used by public-inbox-watch for Maildir (and possibly MH in the future)
 package PublicInbox::DirIdle;
 use strict;
-use base 'PublicInbox::DS';
-use fields qw(inot);
+use parent 'PublicInbox::DS';
 use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
 use PublicInbox::In2Tie;
 
@@ -14,7 +13,8 @@ if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
        $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 {
@@ -24,7 +24,7 @@ if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
 
 sub new {
        my ($class, $dirs, $cb) = @_;
-       my $self = fields::new($class);
+       my $self = bless { cb => $cb }, $class;
        my $inot;
        if ($ino_cls) {
                $inot = $ino_cls->new or die "E: $ino_cls->new: $!";
@@ -36,15 +36,21 @@ sub 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;