diff options
Diffstat (limited to 'lib/PublicInbox/InboxIdle.pm')
| -rw-r--r-- | lib/PublicInbox/InboxIdle.pm | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/lib/PublicInbox/InboxIdle.pm b/lib/PublicInbox/InboxIdle.pm index 4d74b354..3c4d4a68 100644 --- a/lib/PublicInbox/InboxIdle.pm +++ b/lib/PublicInbox/InboxIdle.pm @@ -1,18 +1,18 @@ -# 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> # fields: # inot: Linux::Inotify2-like object # pathmap => { inboxdir => [ ibx, watch1, watch2, watch3... ] } mapping package PublicInbox::InboxIdle; -use strict; +use v5.12; use parent qw(PublicInbox::DS); -use PublicInbox::Syscall qw(EPOLLIN EPOLLET); +use PublicInbox::Syscall qw(EPOLLIN); my $IN_MODIFY = 0x02; # match Linux inotify my $ino_cls; -if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) { - $IN_MODIFY = Linux::Inotify2::IN_MODIFY(); - $ino_cls = 'Linux::Inotify2'; +if ($^O eq 'linux' && eval { require PublicInbox::Inotify }) { + $IN_MODIFY = PublicInbox::Inotify::IN_MODIFY(); + $ino_cls = 'PublicInbox::Inotify'; } elsif (eval { require PublicInbox::KQNotify }) { $IN_MODIFY = PublicInbox::KQNotify::NOTE_WRITE(); $ino_cls = 'PublicInbox::KQNotify'; @@ -30,11 +30,11 @@ sub in2_arm ($$) { # PublicInbox::Config::each_inbox callback my $old_ibx = $cur->[0]; $cur->[0] = $ibx; if ($old_ibx) { - $ibx->{unlock_subs} and - die "BUG: $dir->{unlock_subs} should not exist"; + my $u = $ibx->{unlock_subs}; $ibx->{unlock_subs} = $old_ibx->{unlock_subs}; + %{$ibx->{unlock_subs}} = (%$u, %{$ibx->{unlock_subs}}) if $u; - # Linux::Inotify2::Watch::name matches if watches are the + # *::Inotify*::Watch::name matches if watches are the # same, no point in replacing a watch of the same name if ($cur->[1]->name eq $lock) { $self->{on_unlock}->{$lock} = $ibx; @@ -48,11 +48,9 @@ sub in2_arm ($$) { # PublicInbox::Config::each_inbox callback $self->{on_unlock}->{$w->name} = $ibx; } else { warn "E: ".ref($inot)."->watch($lock, IN_MODIFY) failed: $!\n"; - if ($!{ENOSPC} && $^O eq 'linux') { - warn <<""; -I: consider increasing /proc/sys/fs/inotify/max_user_watches + warn <<"" if $!{ENOSPC} && $^O eq 'linux'; +# consider increasing /proc/sys/fs/inotify/max_user_watches - } } # TODO: detect deleted packs (and possibly other files) @@ -73,7 +71,7 @@ sub new { 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; @@ -89,7 +87,7 @@ sub new { sub event_step { my ($self) = @_; eval { - my @events = $self->{inot}->read; # Linux::Inotify2::read + my @events = $self->{inot}->read; # PublicInbox::Inotify3::read my $on_unlock = $self->{on_unlock}; for my $ev (@events) { my $fn = $ev->fullname // next; # cancelled |