rename {pi_config} fields to {pi_cfg}

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

diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index b9dbe0ccf2251a0d434d6260880dc0d240bb431b..dc97af16c09ed3e06ba1b727a5563dd3f32ea251 100644 (file)
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -3,11 +3,6 @@
 #
 # internal class used by PublicInbox::Git + PublicInbox::DS
 # This parses the output pipe of "git cat-file --batch"
-#
-# Note: this does NOT set the non-blocking flag, we expect `git cat-file'
-# to be a local process, and git won't start writing a blob until it's
-# fully read.  So minimize context switching and read as much as possible
-# and avoid holding a buffer in our heap any longer than it has to live.
 package PublicInbox::GitAsyncCat;
 use strict;
 use parent qw(PublicInbox::DS Exporter);
@@ -53,15 +48,23 @@ sub event_step {
 
 sub git_async_cat ($$$$) {
        my ($git, $oid, $cb, $arg) = @_;
-       my $gitish = $GCF2C;
-       if ($gitish) {
+       my $gitish = $GCF2C //= eval {
+               require PublicInbox::Gcf2;
+               require PublicInbox::Gcf2Client;
+               PublicInbox::Gcf2Client::new();
+       } // 0; # 0: do not retry if libgit2 or Inline::C are missing
+       if ($gitish) { # Gcf2 active, {inflight} may be unset due to errors
+               $GCF2C->{inflight} or
+                       $gitish = $GCF2C = PublicInbox::Gcf2Client::new();
                $oid .= " $git->{git_dir}";
        } else {
                $gitish = $git;
        }
        $gitish->cat_async($oid, $cb, $arg);
        $gitish->{async_cat} //= do {
+               # read-only end of pipe (Gcf2Client is write-only end)
                my $self = bless { gitish => $gitish }, __PACKAGE__;
+               $gitish->{in}->blocking(0);
                $self->SUPER::new($gitish->{in}, EPOLLIN|EPOLLET);
                \undef; # this is a true ref()
        };