about summary refs log tree commit homepage
path: root/lib/PublicInbox
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-06-10 07:04:01 +0000
committerEric Wong <e@yhbt.net>2020-06-13 07:55:45 +0000
commit34c1a6c16733adee3acfe5861096692f3ea55378 (patch)
treef22f3a47a81d5023ce4152d6f6abc129b95a35e7 /lib/PublicInbox
parent90f11ce471c53365a77896c847d0a39b0995b5b5 (diff)
downloadpublic-inbox-34c1a6c16733adee3acfe5861096692f3ea55378.tar.gz
This will be used to implement IMAP IDLE, first.

Eventually, it may be used to trigger other things:

* incremental internal updates for manifest.js.gz
* restart `git cat-file' processes on pack index unlink
* IMAP IDLE-like long-polling HTTP endpoint

And maybe more things we haven't thought of, yet.

It uses Linux::Inotify2 or IO::KQueue depending on what packages
are installed and what the kernel supports.  It falls back to
nanosecond-aware Time::HiRes::stat() (available with Perl 5.10.0+)
on systems lacking Linux::Inotify2 and IO::KQueue.

In the future, a pure Perl alternative to Linux::Inotify2 may be
supplied for users of architectures we already support signalfd
and epoll on.

v2 changes:
- avoid O_TRUNC on lock file
- change ctime on Linux systems w/o inotify
- fix naming of comments and fields
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r--lib/PublicInbox/FakeInotify.pm39
-rw-r--r--lib/PublicInbox/In2Tie.pm17
-rw-r--r--lib/PublicInbox/Inbox.pm20
-rw-r--r--lib/PublicInbox/InboxIdle.pm55
-rw-r--r--lib/PublicInbox/KQNotify.pm60
-rw-r--r--lib/PublicInbox/Lock.pm7
6 files changed, 198 insertions, 0 deletions
diff --git a/lib/PublicInbox/FakeInotify.pm b/lib/PublicInbox/FakeInotify.pm
new file mode 100644
index 00000000..bd610463
--- /dev/null
+++ b/lib/PublicInbox/FakeInotify.pm
@@ -0,0 +1,39 @@
+# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# for systems lacking Linux::Inotify2 or IO::KQueue, just emulates
+# enough of Linux::Inotify2
+package PublicInbox::FakeInotify;
+use strict;
+use Time::HiRes qw(stat);
+my $IN_CLOSE = 0x08 | 0x10; # match Linux inotify
+
+sub new { bless { watch => {} }, __PACKAGE__ }
+
+# behaves like Linux::Inotify2->watch
+sub watch {
+        my ($self, $path, $mask, $cb) = @_;
+        my @st = stat($path) or return;
+        $self->{watch}->{"$path\0$mask"} = [ @st, $cb ];
+}
+
+# behaves like non-blocking Linux::Inotify2->poll
+sub poll {
+        my ($self) = @_;
+        my $watch = $self->{watch} or return;
+        for my $x (keys %$watch) {
+                my ($path, $mask) = split(/\0/, $x, 2);
+                my @now = stat($path) or next;
+                my $prv = $watch->{$x};
+                my $cb = $prv->[-1];
+                # 10: ctime, 7: size
+                if ($prv->[10] != $now[10]) {
+                        if (($mask & $IN_CLOSE) == $IN_CLOSE) {
+                                eval { $cb->() };
+                        }
+                }
+                @$prv = (@now, $cb);
+        }
+}
+
+1;
diff --git a/lib/PublicInbox/In2Tie.pm b/lib/PublicInbox/In2Tie.pm
new file mode 100644
index 00000000..db1dc104
--- /dev/null
+++ b/lib/PublicInbox/In2Tie.pm
@@ -0,0 +1,17 @@
+# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# used to ensure PublicInbox::DS can call fileno() as a function
+# on Linux::Inotify2 objects
+package PublicInbox::In2Tie;
+use strict;
+
+sub TIEHANDLE {
+        my ($class, $in2) = @_;
+        bless \$in2, $class; # a scalar reference to an existing reference
+}
+
+# this calls Linux::Inotify2::fileno
+sub FILENO { ${$_[0]}->fileno }
+
+1;
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index af034358..b250bef3 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -391,4 +391,24 @@ sub altid_map ($) {
         } // {};
 }
 
+# $obj must respond to ->on_inbox_unlock, which takes Inbox ($self) as an arg
+sub subscribe_unlock {
+        my ($self, $ident, $obj) = @_;
+        $self->{unlock_subs}->{$ident} = $obj;
+}
+
+sub unsubscribe_unlock {
+        my ($self, $ident) = @_;
+        delete $self->{unlock_subs}->{$ident};
+}
+
+# called by inotify
+sub on_unlock {
+        my ($self) = @_;
+        my $subs = $self->{unlock_subs} or return;
+        for (values %$subs) {
+                eval { $_->on_inbox_unlock($self) };
+        }
+}
+
 1;
diff --git a/lib/PublicInbox/InboxIdle.pm b/lib/PublicInbox/InboxIdle.pm
new file mode 100644
index 00000000..095a801c
--- /dev/null
+++ b/lib/PublicInbox/InboxIdle.pm
@@ -0,0 +1,55 @@
+# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+package PublicInbox::InboxIdle;
+use strict;
+use base qw(PublicInbox::DS);
+use fields qw(pi_config inot);
+use Symbol qw(gensym);
+use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+my $IN_CLOSE = 0x08 | 0x10; # match Linux inotify
+my $ino_cls;
+if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
+        $IN_CLOSE = Linux::Inotify2::IN_CLOSE();
+        $ino_cls = 'Linux::Inotify2';
+} elsif (eval { require PublicInbox::KQNotify }) {
+        $IN_CLOSE = PublicInbox::KQNotify::IN_CLOSE();
+        $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 });
+        # TODO: detect deleted packs (and possibly other files)
+}
+
+sub new {
+        my ($class, $pi_config) = @_;
+        my $self = fields::new($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);
+        } else {
+                require PublicInbox::FakeInotify;
+                $inot = PublicInbox::FakeInotify->new;
+        }
+        $self->{inot} = $inot;
+        $pi_config->each_inbox(\&in2_arm, $inot);
+        $self;
+}
+
+sub event_step {
+        my ($self) = @_;
+        eval { $self->{inot}->poll }; # Linux::Inotify2::poll
+        warn "$self->{inot}->poll err: $@\n" if $@;
+}
+
+1;
diff --git a/lib/PublicInbox/KQNotify.pm b/lib/PublicInbox/KQNotify.pm
new file mode 100644
index 00000000..3cf9c0f5
--- /dev/null
+++ b/lib/PublicInbox/KQNotify.pm
@@ -0,0 +1,60 @@
+# Copyright (C) 2020 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 IO::KQueue;
+use PublicInbox::DSKQXS; # wraps IO::KQueue for fork-safe DESTROY
+
+# only true as far as public-inbox is concerned with .lock files:
+sub IN_CLOSE () { NOTE_WRITE }
+#sub IN_CLOSE () { 0x200 } # NOTE_CLOSE_WRITE (FreeBSD 11+ only)
+
+sub new {
+        my ($class) = @_;
+        bless { dskq => PublicInbox::DSKQXS->new, watch => {} }, $class;
+}
+
+sub watch {
+        my ($self, $path, $mask, $cb) = @_;
+        open(my $fh, '<', $path) or return;
+        my $ident = fileno($fh);
+        $self->{dskq}->{kq}->EV_SET($ident, # ident
+                EVFILT_VNODE, # filter
+                EV_ADD | EV_CLEAR, # flags
+                $mask, # fflags
+                0, 0); # data, udata
+        if ($mask == IN_CLOSE) {
+                $self->{watch}->{$ident} = [ $fh, $cb ];
+        } else {
+                die "TODO Not implemented: $mask";
+        }
+}
+
+# emulate Linux::Inotify::fileno
+sub fileno { ${$_[0]->{dskq}->{kq}} }
+
+# noop for Linux::Inotify2 compatibility.  Unlike inotify,
+# kqueue doesn't seem to overflow since it's limited by the number of
+# open FDs the process has
+sub on_overflow {}
+
+# noop for Linux::Inotify2 compatibility, we use `0' timeout for ->kevent
+sub blocking {}
+
+# behave like Linux::Inotify2::poll
+sub poll {
+        my ($self) = @_;
+        my @kevents = $self->{dskq}->{kq}->kevent(0);
+        for my $kev (@kevents) {
+                my $ident = $kev->[KQ_IDENT];
+                my $mask = $kev->[KQ_FFLAGS];
+                if (($mask & IN_CLOSE) == IN_CLOSE) {
+                        eval { $self->{watch}->{$ident}->[1]->() };
+                }
+        }
+}
+
+1;
diff --git a/lib/PublicInbox/Lock.pm b/lib/PublicInbox/Lock.pm
index 032841ed..693a3794 100644
--- a/lib/PublicInbox/Lock.pm
+++ b/lib/PublicInbox/Lock.pm
@@ -24,6 +24,13 @@ sub lock_release {
         my ($self) = @_;
         return unless $self->{lock_path};
         my $lockfh = delete $self->{lockfh} or croak 'not locked';
+
+        # NetBSD 8.1 and OpenBSD 6.5 (and maybe other versions/*BSDs) lack
+        # NOTE_CLOSE_WRITE from FreeBSD 11+, so trigger NOTE_WRITE, instead.
+        # We also need to change the ctime on Linux systems w/o inotify
+        if ($^O ne 'linux' || !eval { require Linux::Inotify2; 1 }) {
+                syswrite($lockfh, '.');
+        }
         flock($lockfh, LOCK_UN) or die "unlock failed: $!\n";
         close $lockfh or die "close failed: $!\n";
 }