about summary refs log tree commit homepage
path: root/lib/PublicInbox/GitAsyncCat.pm
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-06-23 23:21:12 +0000
committerEric Wong <e@yhbt.net>2020-06-25 05:37:59 +0000
commit10ee3548084c125f20fe2c830faea2a43413be92 (patch)
treecb71ebd707af3b6b5e7a2854de35039af16cb5bf /lib/PublicInbox/GitAsyncCat.pm
parentf977826a17f8735e6947dd2da380df8c6d0b38d8 (diff)
downloadpublic-inbox-10ee3548084c125f20fe2c830faea2a43413be92.tar.gz
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.
Diffstat (limited to 'lib/PublicInbox/GitAsyncCat.pm')
-rw-r--r--lib/PublicInbox/GitAsyncCat.pm10
1 files changed, 5 insertions, 5 deletions
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;