user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH v2] git_async_cat: unref pipes on EOF from git->cleanup
Date: Mon, 6 Jul 2020 06:11:02 +0000	[thread overview]
Message-ID: <20200706061102.GA15566@dcvr> (raw)
In-Reply-To: <20200705225045.29291-1-e@yhbt.net>

We avoided a managed circular reference in 10ee3548084c125f
but introduced a pipe FD leak, instead.  So handle the EOF
we get when the "git cat-file --batch" process exits and
closes its stdout FD.

v2: remove ->close entirely.  PublicInbox::Git->cleanup
handles all cleanup.  This prevents us from inadvertantly
deleting the {async_cat} field associated with a different
pipe than the one GAC is monitoring.

Fixes: 10ee3548084c125f ("git_async_cat: remove circular reference")
---
 lib/PublicInbox/GitAsyncCat.pm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index 0b777204a..e79f416db 100644
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -24,7 +24,8 @@ sub _add {
 
 sub event_step {
 	my ($self) = @_;
-	my $git = $self->{git} or return; # ->close-ed
+	my $git = $self->{git};
+	return $self->close if ($git->{in} // 0) != $self->{sock};
 	my $inflight = $git->{inflight};
 	if ($inflight && @$inflight) {
 		$git->cat_async_step($inflight);
@@ -32,14 +33,6 @@ sub event_step {
 	}
 }
 
-sub close {
-	my ($self) = @_;
-	if (my $git = delete $self->{git}) {
-		delete $git->{async_cat};
-	}
-	$self->SUPER::close; # PublicInbox::DS::close
-}
-
 sub git_async_cat ($$$$) {
 	my ($git, $oid, $cb, $arg) = @_;
 	$git->cat_async($oid, $cb, $arg);

  reply	other threads:[~2020-07-06  6:11 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-05 22:50 [PATCH] git_async_cat: unref pipes on EOF from git->cleanup Eric Wong
2020-07-06  6:11 ` Eric Wong [this message]
2020-07-06 19:48   ` [PATCH v2] " 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

  List information: http://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200706061102.GA15566@dcvr \
    --to=e@yhbt.net \
    --cc=meta@public-inbox.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.
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).