X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInboxIdle.pm;h=59cb833fd5a10b466ae74ac8a65d91df3987ffa6;hb=94096cab6cd5e00c8a36a4a2667bdb9acf43d01f;hp=d0bb43c58486a5900348a74031cb44f95820bf74;hpb=01f2e00be4671e1100b6180310c0fd8c0035ebc8;p=public-inbox.git
diff --git a/lib/PublicInbox/InboxIdle.pm b/lib/PublicInbox/InboxIdle.pm
index d0bb43c5..59cb833f 100644
--- a/lib/PublicInbox/InboxIdle.pm
+++ b/lib/PublicInbox/InboxIdle.pm
@@ -1,20 +1,22 @@
# 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 pathmap);
+use parent qw(PublicInbox::DS);
use Cwd qw(abs_path);
-use Symbol qw(gensym);
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;
@@ -39,7 +41,7 @@ sub in2_arm ($$) { # PublicInbox::Config::each_inbox callback
$cur->[0] = $ibx;
my $lock = "$dir/".($ibx->version >= 2 ? 'inbox.lock' : 'ssoma.lock');
- $cur->[1] = $inot->watch($lock, $IN_CLOSE, sub { $ibx->on_unlock });
+ $cur->[1] = $inot->watch($lock, $IN_MODIFY, sub { $ibx->on_unlock });
# TODO: detect deleted packs (and possibly other files)
}
@@ -51,18 +53,12 @@ sub refresh {
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);
- if ($inot->can('on_overflow')) {
- # broadcasts everything on overflow
- $inot->on_overflow(undef);
- }
- $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;