user/dev discussion of public-inbox itself
 help / color / Atom feed
* [PATCH] qspawn: shorten lifetime of environ and opts args
@ 2019-09-15  2:25 Eric Wong
  0 siblings, 0 replies; only message in thread
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	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-15  2:25 [PATCH] qspawn: shorten lifetime of environ and opts args Eric Wong

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror https://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox