From f1c9ad532f8dd46df172cfde85329a6e00ed1eab Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 10 Jun 2020 07:04:31 +0000 Subject: 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. --- lib/PublicInbox/Git.pm | 3 +++ lib/PublicInbox/GitAsyncCat.pm | 14 ++++++++------ lib/PublicInbox/IMAP.pm | 8 +++++--- lib/PublicInbox/Inbox.pm | 3 --- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index b3ae2b81..60236afe 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -283,6 +283,9 @@ sub qx { # returns true if there are pending "git cat-file" processes sub cleanup { my ($self) = @_; + if (my $ac = $self->{async_cat}) { + $ac->close; # PublicInbox::GitAsyncCat::close -> EPOLL_CTL_DEL + } cat_async_wait($self); _destroy($self, qw(cat_rbuf in out pid)); _destroy($self, qw(chk_rbuf in_c out_c pid_c err_c)); 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; diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm index 3c32d846..3815141a 100644 --- a/lib/PublicInbox/IMAP.pm +++ b/lib/PublicInbox/IMAP.pm @@ -388,7 +388,7 @@ sub requeue_once ($) { $self->requeue if $new_size == 1; } -sub uid_fetch_cb { # called by git->cat_async via git_async_msg +sub uid_fetch_cb { # called by git->cat_async via git_async_cat my ($bref, $oid, $type, $size, $fetch_m_arg) = @_; my ($self, undef, $ibx, $msgs, undef, $want) = @$fetch_m_arg; my $smsg = shift @$msgs or die 'BUG: no smsg'; @@ -400,6 +400,7 @@ sub uid_fetch_cb { # called by git->cat_async via git_async_msg } else { $smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid"; } + $$bref =~ s/(?[0], \&uid_fetch_cb, \@_); + git_async_cat($ibx->git, $msgs->[0]->{blob}, \&uid_fetch_cb, \@_); } sub cmd_status ($$$;@) { @@ -719,7 +720,8 @@ sub seq_fetch_m { # long_response my $seq = $want->{-seqno}++; my $cur_num = $msgs->[0]->{num}; if ($cur_num == $seq) { # as expected - git_async_msg($ibx, $msgs->[0], \&uid_fetch_cb, \@_); + git_async_cat($ibx->git, $msgs->[0]->{blob}, + \&uid_fetch_cb, \@_); } elsif ($cur_num > $seq) { # send dummy messages until $seq catches up to $cur_num my $smsg = bless { num => $seq, ts => 0 }, 'PublicInbox::Smsg'; diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index 407751c3..b2b0b56f 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -22,9 +22,6 @@ my $CLEANUP = {}; # string(inbox) -> inbox sub git_cleanup ($) { my ($self) = @_; my $git = $self->{git} or return; - if (my $async_cat = delete $self->{async_cat}) { - $async_cat->close; - } $git->cleanup; } -- cgit v1.2.3-24-ge0c7