* [PATCH 2/3] io: avoid redundant waitpid in DESTROY
2024-04-12 18:04 5% [PATCH 0/3] some lei fixes Eric Wong
@ 2024-04-12 18:04 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2024-04-12 18:04 UTC (permalink / raw)
To: meta
We shouldn't attempt to reap a process again after it's been
reaped asynchronously in the SIGCHLD handler. Noticed while
working on changes to get lei/store to use checkpointing.
---
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;
}
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] some lei fixes
@ 2024-04-12 18:04 5% Eric Wong
2024-04-12 18:04 7% ` [PATCH 2/3] io: avoid redundant waitpid in DESTROY Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2024-04-12 18:04 UTC (permalink / raw)
To: meta
Some trivial fixes I noticed while (still) working on getting
lei to use checkpoint to improve parallelism.
Eric Wong (3):
lei_remote: solver supports uncommitted blobs
io: avoid redundant waitpid in DESTROY
lei: remove leftover debugging message
lib/PublicInbox/IO.pm | 10 +++++-----
lib/PublicInbox/LEI.pm | 2 --
lib/PublicInbox/LeiRemote.pm | 13 ++++++++++---
3 files changed, 15 insertions(+), 10 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2024-04-12 18:04 5% [PATCH 0/3] some lei fixes Eric Wong
2024-04-12 18:04 7% ` [PATCH 2/3] io: avoid redundant waitpid in DESTROY Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).