X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInboxIdle.pm;h=59cb833fd5a10b466ae74ac8a65d91df3987ffa6;hb=94096cab6cd5e00c8a36a4a2667bdb9acf43d01f;hp=095a801c946514099639f7e82db80e23e3a46331;hpb=34c1a6c16733adee3acfe5861096692f3ea55378;p=public-inbox.git
diff --git a/lib/PublicInbox/InboxIdle.pm b/lib/PublicInbox/InboxIdle.pm
index 095a801c..59cb833f 100644
--- a/lib/PublicInbox/InboxIdle.pm
+++ b/lib/PublicInbox/InboxIdle.pm
@@ -1,48 +1,71 @@
# Copyright (C) 2020 all contributors
# License: AGPL-3.0+
+# fields:
+# pi_config: PublicInbox::Config ref
+# inot: Linux::Inotify2-like object
+# pathmap => { inboxdir => [ ibx, watch1, watch2, watch3... ] } mapping
package PublicInbox::InboxIdle;
use strict;
-use base qw(PublicInbox::DS);
-use fields qw(pi_config inot);
-use Symbol qw(gensym);
+use parent qw(PublicInbox::DS);
+use Cwd qw(abs_path);
use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
-my $IN_CLOSE = 0x08 | 0x10; # match Linux inotify
+my $IN_MODIFY = 0x02; # match Linux inotify
my $ino_cls;
if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
- $IN_CLOSE = Linux::Inotify2::IN_CLOSE();
+ $IN_MODIFY = Linux::Inotify2::IN_MODIFY();
$ino_cls = 'Linux::Inotify2';
} elsif (eval { require PublicInbox::KQNotify }) {
- $IN_CLOSE = PublicInbox::KQNotify::IN_CLOSE();
+ $IN_MODIFY = PublicInbox::KQNotify::NOTE_WRITE();
$ino_cls = 'PublicInbox::KQNotify';
}
require PublicInbox::In2Tie if $ino_cls;
sub in2_arm ($$) { # PublicInbox::Config::each_inbox callback
- my ($ibx, $inot) = @_;
- my $path = "$ibx->{inboxdir}/";
- $path .= $ibx->version >= 2 ? 'inbox.lock' : 'ssoma.lock';
- $inot->watch($path, $IN_CLOSE, sub { $ibx->on_unlock });
+ my ($ibx, $self) = @_;
+ my $dir = abs_path($ibx->{inboxdir});
+ if (!defined($dir)) {
+ warn "W: $ibx->{inboxdir} not watched: $!\n";
+ return;
+ }
+ my $inot = $self->{inot};
+ my $cur = $self->{pathmap}->{$dir} //= [];
+
+ # transfer old subscriptions to the current inbox, cancel the old watch
+ if (my $old_ibx = $cur->[0]) {
+ $ibx->{unlock_subs} and
+ die "BUG: $dir->{unlock_subs} should not exist";
+ $ibx->{unlock_subs} = $old_ibx->{unlock_subs};
+ $cur->[1]->cancel;
+ }
+ $cur->[0] = $ibx;
+
+ my $lock = "$dir/".($ibx->version >= 2 ? 'inbox.lock' : 'ssoma.lock');
+ $cur->[1] = $inot->watch($lock, $IN_MODIFY, sub { $ibx->on_unlock });
+
# TODO: detect deleted packs (and possibly other files)
}
+sub refresh {
+ my ($self, $pi_config) = @_;
+ $pi_config->each_inbox(\&in2_arm, $self);
+}
+
sub new {
my ($class, $pi_config) = @_;
- my $self = fields::new($class);
+ my $self = bless {}, $class;
my $inot;
if ($ino_cls) {
$inot = $ino_cls->new or die "E: $ino_cls->new: $!";
- my $sock = gensym;
- tie *$sock, 'PublicInbox::In2Tie', $inot;
- $inot->blocking(0);
- $inot->on_overflow(undef); # broadcasts everything on overflow
- $self->SUPER::new($sock, EPOLLIN | EPOLLET);
+ my $io = PublicInbox::In2Tie::io($inot);
+ $self->SUPER::new($io, EPOLLIN | EPOLLET);
} else {
require PublicInbox::FakeInotify;
$inot = PublicInbox::FakeInotify->new;
}
$self->{inot} = $inot;
- $pi_config->each_inbox(\&in2_arm, $inot);
+ $self->{pathmap} = {}; # inboxdir => [ ibx, watch1, watch2, watch3...]
+ refresh($self, $pi_config);
$self;
}
@@ -52,4 +75,8 @@ sub event_step {
warn "$self->{inot}->poll err: $@\n" if $@;
}
+# for graceful shutdown in PublicInbox::Daemon,
+# just ensure the FD gets closed ASAP and subscribers
+sub busy { 0 }
+
1;