No ext_urls

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

diff --git a/lib/PublicInbox/KQNotify.pm b/lib/PublicInbox/KQNotify.pm
index fc321a1674992558904e85c33251e6c3e15721ae..381711fae8f400bf11b3f0bb3316c04d66207336 100644 (file)
--- a/lib/PublicInbox/KQNotify.pm
+++ b/lib/PublicInbox/KQNotify.pm
@@ -1,11 +1,10 @@
-# 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>
 
 # implements the small subset of Linux::Inotify2 functionality we use
 # using IO::KQueue on *BSD systems.
 package PublicInbox::KQNotify;
-use strict;
-use v5.10.1;
+use v5.12;
 use IO::KQueue;
 use PublicInbox::DSKQXS; # wraps IO::KQueue for fork-safe DESTROY
 use PublicInbox::FakeInotify qw(fill_dirlist on_dir_change);
@@ -29,18 +28,19 @@ sub watch {
                        'PublicInbox::KQNotify::Watchdir';
        } else {
                open($fh, '<', $path) or return;
-               $watch = bless [ $fh, $path ],
-                       'PublicInbox::KQNotify::Watch';
+               $watch = bless [ $fh, $path ], 'PublicInbox::KQNotify::Watch';
        }
        my $ident = fileno($fh);
-       $self->{dskq}->{kq}->EV_SET($ident, # ident
+       $self->{dskq}->{kq}->EV_SET($ident, # ident (fd)
                EVFILT_VNODE, # filter
                EV_ADD | EV_CLEAR, # flags
                $mask, # fflags
                0, 0); # data, udata
-       if ($mask & (MOVED_TO_OR_CREATE | NOTE_DELETE)) {
+       if ($mask & (MOVED_TO_OR_CREATE|NOTE_DELETE|NOTE_LINK|NOTE_REVOKE)) {
                $self->{watch}->{$ident} = $watch;
-               fill_dirlist($self, $path, $fh) if $mask & NOTE_DELETE;
+               if ($mask & (NOTE_DELETE|NOTE_LINK|NOTE_REVOKE)) {
+                       fill_dirlist($self, $path, $fh)
+               }
        } else {
                die "TODO Not implemented: $mask";
        }
@@ -63,33 +63,49 @@ sub read {
        my ($self) = @_;
        my @kevents = $self->{dskq}->{kq}->kevent(0);
        my $events = [];
+       my @gone;
+       my $watch = $self->{watch};
        for my $kev (@kevents) {
                my $ident = $kev->[KQ_IDENT];
                my $mask = $kev->[KQ_FFLAGS];
-               my ($dh, $path, $old_ctime) = @{$self->{watch}->{$ident}};
+               my ($dh, $path, $old_ctime) = @{$watch->{$ident}};
                if (!defined($old_ctime)) {
                        push @$events,
                                bless(\$path, 'PublicInbox::FakeInotify::Event')
-               } elsif ($mask & (MOVED_TO_OR_CREATE | NOTE_DELETE)) {
-                       my @new_st = stat($path) or next;
-                       $self->{watch}->{$ident}->[3] = $new_st[10]; # ctime
+               } elsif ($mask & (MOVED_TO_OR_CREATE|NOTE_DELETE|NOTE_LINK|
+                               NOTE_REVOKE|NOTE_RENAME)) {
+                       my @new_st = stat($path);
+                       if (!@new_st && $!{ENOENT}) {
+                               push @$events, bless(\$path,
+                                               'PublicInbox::FakeInotify::'.
+                                               'SelfGoneEvent');
+                               push @gone, $ident;
+                               delete $self->{dirlist}->{$path};
+                               next;
+                       }
+                       if (!@new_st) {
+                               warn "unhandled stat($path) error: $!\n";
+                               next;
+                       }
+                       $watch->{$ident}->[3] = $new_st[10]; # ctime
                        rewinddir($dh);
                        on_dir_change($events, $dh, $path, $old_ctime,
                                        $self->{dirlist});
                }
        }
+       delete @$watch{@gone};
        @$events;
 }
 
 package PublicInbox::KQNotify::Watch;
-use strict;
+use v5.12;
 
 sub name { $_[0]->[1] }
 
 sub cancel { close $_[0]->[0] or die "close: $!" }
 
 package PublicInbox::KQNotify::Watchdir;
-use strict;
+use v5.12;
 
 sub name { $_[0]->[1] }