-# Copyright (C) 2020 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:
-# pi_config: PublicInbox::Config ref
# 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 Cwd qw(abs_path);
-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 }) {
sub in2_arm ($$) { # PublicInbox::Config::each_inbox callback
my ($ibx, $self) = @_;
- my $dir = abs_path($ibx->{inboxdir});
- if (!defined($dir)) {
- warn "W: $ibx->{inboxdir} not watched: $!\n";
- return;
- }
+ my $dir = $ibx->{inboxdir};
my $inot = $self->{inot};
my $cur = $self->{pathmap}->{$dir} //= [];
my $lock = "$dir/".($ibx->version >= 2 ? 'inbox.lock' : 'ssoma.lock');
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
# same, no point in replacing a watch of the same name
$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)
}
sub refresh {
- my ($self, $pi_config) = @_;
- $pi_config->each_inbox(\&in2_arm, $self);
+ my ($self, $pi_cfg) = @_;
+ $pi_cfg->each_inbox(\&in2_arm, $self);
}
+# internal API for ease-of-use
+sub watch_inbox { in2_arm($_[1], $_[0]) };
+
sub new {
- my ($class, $pi_config) = @_;
+ my ($class, $pi_cfg) = @_;
my $self = bless {}, $class;
my $inot;
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;
$self->{inot} = $inot;
$self->{pathmap} = {}; # inboxdir => [ ibx, watch1, watch2, watch3...]
$self->{on_unlock} = {}; # lock path => ibx
- refresh($self, $pi_config);
+ refresh($self, $pi_cfg) if $pi_cfg;
PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
$self;
}
my @events = $self->{inot}->read; # Linux::Inotify2::read
my $on_unlock = $self->{on_unlock};
for my $ev (@events) {
- if (my $ibx = $on_unlock->{$ev->fullname}) {
+ my $fn = $ev->fullname // next; # cancelled
+ if (my $ibx = $on_unlock->{$fn}) {
$ibx->on_unlock;
}
}