From 0f8cfbace2ab68aabfdfb6e9a06023043e943a67 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 4 Oct 2021 08:26:33 +0000 Subject: {dir,inbox}idle: use level-triggered epoll Both read(2) on inotify and kevent(2) return a finite amount of events. Let the kernel notify us again in cases where we'd need to retry instead of looping ourselves. This can prevent missed/delayed notifications while still ensuring fairness in busy event loops. --- lib/PublicInbox/DirIdle.pm | 4 ++-- lib/PublicInbox/InboxIdle.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm index d572c274..c9a293e9 100644 --- a/lib/PublicInbox/DirIdle.pm +++ b/lib/PublicInbox/DirIdle.pm @@ -5,7 +5,7 @@ package PublicInbox::DirIdle; use strict; use parent 'PublicInbox::DS'; -use PublicInbox::Syscall qw(EPOLLIN EPOLLET); +use PublicInbox::Syscall qw(EPOLLIN); use PublicInbox::In2Tie; my ($MAIL_IN, $MAIL_GONE, $ino_cls); @@ -38,7 +38,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; # starts timer diff --git a/lib/PublicInbox/InboxIdle.pm b/lib/PublicInbox/InboxIdle.pm index 4d74b354..2781b3e1 100644 --- a/lib/PublicInbox/InboxIdle.pm +++ b/lib/PublicInbox/InboxIdle.pm @@ -7,7 +7,7 @@ package PublicInbox::InboxIdle; use strict; 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 }) { @@ -73,7 +73,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; -- cgit v1.2.3-24-ge0c7