From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH] io: avoid redundant waitpid in DESTROY
Date: Fri, 12 Apr 2024 17:50:58 +0000 [thread overview]
Message-ID: <20240412175058.2774148-1-e@80x24.org> (raw)
We shouldn't attempt to reap a process again after it's been
reaped asynchronously in the SIGCHLD handler.
---
lib/PublicInbox/IO.pm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/IO.pm b/lib/PublicInbox/IO.pm
index 02057600..8640f112 100644
--- a/lib/PublicInbox/IO.pm
+++ b/lib/PublicInbox/IO.pm
@@ -16,7 +16,7 @@ use PublicInbox::OnDestroy;
sub waitcb { # awaitpid callback
my ($pid, $errref, $cb, @args) = @_;
- $$errref = $? if $errref; # sets .cerr for _close
+ $$errref = $?; # sets .cerr for _close
$cb->($pid, @args) if $cb; # may clobber $?
}
@@ -24,9 +24,9 @@ sub attach_pid {
my ($io, $pid, @cb_arg) = @_;
bless $io, __PACKAGE__;
# we share $err (and not $self) with awaitpid to avoid a ref cycle
- ${*$io}{pi_io_reap} = [ $PublicInbox::OnDestroy::fork_gen,
- $pid, \(my $err) ];
- awaitpid($pid, \&waitcb, \$err, @cb_arg);
+ my $e = \(my $err);
+ ${*$io}{pi_io_reap} = [ $PublicInbox::OnDestroy::fork_gen, $pid, $e ];
+ awaitpid($pid, \&waitcb, $e, @cb_arg);
$io;
}
@@ -60,7 +60,7 @@ sub DESTROY {
my $reap = delete ${*$io}{pi_io_reap};
if (($reap->[0] // -1) == $PublicInbox::OnDestroy::fork_gen) {
$io->SUPER::close;
- awaitpid($reap->[1]);
+ ${$reap->[2]} // awaitpid($reap->[1]);
}
$io->SUPER::DESTROY;
}
next reply other threads:[~2024-04-12 17:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-12 17:50 Eric Wong [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-12 17:39 [PATCH] io: avoid redundant waitpid in DESTROY Eric Wong
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=20240412175058.2774148-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).