ds: remove fields.pm usage

[public-inbox.git] / lib / PublicInbox / GitAsyncCat.pm

diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index 65e161219699e45730e637be17bde7b94a7e9166..0b777204a7ccfe021fe102c3218c2af4de5565ce 100644 (file)
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -11,24 +11,22 @@
 package PublicInbox::GitAsyncCat;
 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 {
+sub _add {
        my ($class, $git) = @_;
-       my $self = fields::new($class);
        $git->batch_prepare;
+       my $self = bless { git => $git }, $class;
        $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};
        }
@@ -36,14 +34,16 @@ sub event_step {
 
 sub close {
        my ($self) = @_;
-       delete $self->{git};
+       if (my $git = delete $self->{git}) {
+               delete $git->{async_cat};
+       }
        $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} //= _add(__PACKAGE__, $git);
 }
 
 1;