* [PATCH] qspawn: shorten lifetime of environ and opts args
@ 2019-09-15 2:25 7% Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2019-09-15 2:25 UTC (permalink / raw)
To: meta
We don't need to hold onto the subprocess environ and
redirects/options for popen_rd after spawning the child process.
I do not expect this to fix problem of leaking unlinked regular
file descriptors (which I still can't reproduce), and it
definitely does not fix the problem of leaking pipe descriptors
(which I also can't reproduce).
This will save an FD sooner on non-public-inbox-httpd servers
which give a non-FD $env->{'psgi.input'}, however
Regardless, it's good to free up memory resources in our own
process ASAP we're done using them.
---
lib/PublicInbox/Qspawn.pm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm
index 4b9bca5a..54976b00 100644
--- a/lib/PublicInbox/Qspawn.pm
+++ b/lib/PublicInbox/Qspawn.pm
@@ -56,6 +56,11 @@ sub _do_spawn {
}
($self->{rpipe}, $self->{pid}) = popen_rd($cmd, $env, \%opts);
+
+ # drop any IO handles opt was holding open via $opt->{hold}
+ # No need to hold onto the descriptor once the child process has it.
+ $self->{args} = $cmd; # keep this around for logging
+
if (defined $self->{pid}) {
$limiter->{running}++;
} else {
@@ -104,7 +109,7 @@ sub waitpid_err ($$) {
$self->{err} = $err;
my $env = $self->{env} or return;
if (!$env->{'qspawn.quiet'}) {
- log_err($env, join(' ', @{$self->{args}->[0]}) . ": $err");
+ log_err($env, join(' ', @{$self->{args}}) . ": $err");
}
}
--
EW
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-09-15 2:25 7% [PATCH] qspawn: shorten lifetime of environ and opts args 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).