From 10ee3548084c125f20fe2c830faea2a43413be92 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 23 Jun 2020 23:21:12 +0000 Subject: git_async_cat: remove circular reference While this circular reference was carefully managed to not leak memory; it was still triggering a warning at -imapd/-nntpd shutdown due to the EPOLL_CTL_DEL op failing after the $Epoll FD gets closed. So remove the circular reference by providing a ref to `undef', instead. --- lib/PublicInbox/GitAsyncCat.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/PublicInbox/GitAsyncCat.pm') diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm index 8701e4cf..098101ae 100644 --- a/lib/PublicInbox/GitAsyncCat.pm +++ b/lib/PublicInbox/GitAsyncCat.pm @@ -15,20 +15,20 @@ use fields qw(git); use PublicInbox::Syscall qw(EPOLLIN EPOLLET); our @EXPORT = qw(git_async_cat); -sub new { +sub _add { my ($class, $git) = @_; my $self = fields::new($class); $git->batch_prepare; $self->SUPER::new($git->{in}, EPOLLIN|EPOLLET); $self->{git} = $git; - $self; + \undef; # this is a true ref() } sub event_step { my ($self) = @_; my $git = $self->{git} or return; # ->close-ed my $inflight = $git->{inflight}; - if (@$inflight) { + if ($inflight && @$inflight) { $git->cat_async_step($inflight); $self->requeue if @$inflight || exists $git->{cat_rbuf}; } @@ -37,7 +37,7 @@ sub event_step { sub close { my ($self) = @_; if (my $git = delete $self->{git}) { - delete $git->{async_cat}; # drop circular reference + delete $git->{async_cat}; } $self->SUPER::close; # PublicInbox::DS::close } @@ -45,7 +45,7 @@ sub close { sub git_async_cat ($$$$) { my ($git, $oid, $cb, $arg) = @_; $git->cat_async($oid, $cb, $arg); - $git->{async_cat} //= new(__PACKAGE__, $git); # circular reference + $git->{async_cat} //= _add(__PACKAGE__, $git); } 1; -- cgit v1.2.3-24-ge0c7