git: move async_cat reference to PublicInbox::Git

Trying to avoid a circular reference by relying on $ibx object
here makes no sense, since skipping GitCatAsync::close will
result in an FD leak, anyways.  So keep GitAsyncCat contained to
git-only operations, since we'll be using it for Solver in the
distant feature.

1 files changed, 8 insertions, 6 deletions

diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index 65e16121..8701e4cf 100644
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -13,7 +13,7 @@ use strict;
 use parent qw(PublicInbox::DS Exporter);
 use fields qw(git);
 use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
-our @EXPORT = qw(git_async_msg);
+our @EXPORT = qw(git_async_cat);
 
 sub new {
         my ($class, $git) = @_;
@@ -36,14 +36,16 @@ sub event_step {
 
 sub close {
         my ($self) = @_;
-        delete $self->{git};
+        if (my $git = delete $self->{git}) {
+                delete $git->{async_cat}; # drop circular reference
+        }
         $self->SUPER::close; # PublicInbox::DS::close
 }
 
-sub git_async_msg ($$$$) {
-        my ($ibx, $smsg, $cb, $arg) = @_;
-        $ibx->git->cat_async($smsg->{blob}, $cb, $arg);
-        $ibx->{async_cat} //= new(__PACKAGE__, $ibx->{git});
+sub git_async_cat ($$$$) {
+        my ($git, $oid, $cb, $arg) = @_;
+        $git->cat_async($oid, $cb, $arg);
+        $git->{async_cat} //= new(__PACKAGE__, $git); # circular reference
 }
 
 1;