dumping ground for random patches and texts
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH] tail_notify: explicitly detect self deletion
Date: Fri,  8 Sep 2023 07:47:22 +0000	[thread overview]
Message-ID: <20230908074722.94786-1-e@80x24.org> (raw)

This allows t/tail_notify.t to pass more reliably using
FreeBSD with IO::KQueue.
---
 lib/PublicInbox/TailNotify.pm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/TailNotify.pm b/lib/PublicInbox/TailNotify.pm
index f4ffb296..bdb92d54 100644
--- a/lib/PublicInbox/TailNotify.pm
+++ b/lib/PublicInbox/TailNotify.pm
@@ -14,12 +14,14 @@ if ($^O eq 'linux' && eval { require PublicInbox::Inotify; 1 }) {
 		Linux::Inotify2::IN_MODIFY();
 	$ino_cls = 'PublicInbox::Inotify';
 } elsif (eval { require PublicInbox::KQNotify }) {
-	$TAIL_MOD = PublicInbox::KQNotify::MOVED_TO_OR_CREATE();
+	$TAIL_MOD = PublicInbox::KQNotify::MOVED_TO_OR_CREATE() |
+		IO::KQueue::NOTE_DELETE() | IO::KQueue::NOTE_RENAME();
 	$ino_cls = 'PublicInbox::KQNotify';
 } else {
 	require PublicInbox::FakeInotify;
 	$TAIL_MOD = PublicInbox::FakeInotify::MOVED_TO_OR_CREATE() |
-		PublicInbox::FakeInotify::IN_MODIFY();
+		PublicInbox::FakeInotify::IN_MODIFY() |
+		PublicInbox::FakeInotify::IN_DELETE();
 }
 require IO::Poll if $ino_cls;
 
@@ -49,6 +51,11 @@ sub new {
 	$self;
 }
 
+sub delete_self {
+	for (@_) { return 1 if $_->IN_DELETE_SELF }
+	undef;
+}
+
 sub getlines {
 	my ($self, $timeo) = @_;
 	my ($fh, $buf, $rfds, @ret, @events);
@@ -70,13 +77,12 @@ again:
 		}
 		select($rfds, undef, undef, $wait);
 	}
-	# XXX do we care about @events contents?
-	# use Data::Dumper; warn '# ',Dumper(\@events);
 	if ($fh = $self->{watch_fh}) {
 		sysread($fh, $buf, -s $fh) and
 			push @ret, split(/^/sm, $buf);
 		my @st = stat($self->{fn});
-		if (!@st || "@st[0, 1]" ne $self->{ino_dev}) {
+		if (!@st || "@st[0, 1]" ne $self->{ino_dev} ||
+				delete_self(@events)) {
 			delete @$self{qw(ino_dev watch_fh)};
 		}
 	}

                 reply	other threads:[~2023-09-08  7:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230908074722.94786-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=spew@80x24.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).