From fa5aad1d5f3c5abaa28a49181674930f2e06066e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 21 Jan 2023 08:58:19 +0000 Subject: ds: awaitpid: do not clobber entries for reaped processes We must only write to $AWAIT_PIDS on the initial reap attempt. While we're at it, avoid triggering an extra wakeup if we're doing synchronous awaitpid. This seems to eliminate most reliance on Qspawn->DESTROY to call Qspawn->finalize. --- lib/PublicInbox/DS.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm index 523d47e4..0a763d0e 100644 --- a/lib/PublicInbox/DS.pm +++ b/lib/PublicInbox/DS.pm @@ -699,8 +699,8 @@ sub long_response ($$;@) { } sub awaitpid { - my ($pid, @cb_args) = @_; - $AWAIT_PIDS->{$pid} //= @cb_args ? \@cb_args : 0; + my ($pid, @cb_args) = @_; # @cb_args = ($cb, @args), $cb may be undef + $AWAIT_PIDS->{$pid} = \@cb_args if @cb_args; # provide synchronous API if (defined(wantarray) || (!$in_loop && !@cb_args)) { my $ret; @@ -716,9 +716,9 @@ again: delete $AWAIT_PIDS->{$pid}; } return $ret; + } elsif ($in_loop) { # We could've just missed our SIGCHLD, cover it, here: + enqueue_reap(); } - # We could've just missed our SIGCHLD, cover it, here: - enqueue_reap() if $in_loop; } 1; -- cgit v1.2.3-24-ge0c7