diff options
Diffstat (limited to 'lib/PublicInbox/GitAsyncCat.pm')
-rw-r--r-- | lib/PublicInbox/GitAsyncCat.pm | 114 |
1 files changed, 13 insertions, 101 deletions
diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm index 2e0725a6..f57e0336 100644 --- a/lib/PublicInbox/GitAsyncCat.pm +++ b/lib/PublicInbox/GitAsyncCat.pm @@ -1,89 +1,36 @@ # Copyright (C) all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> -# -# internal class used by PublicInbox::Git + PublicInbox::DS -# This parses the output pipe of "git cat-file --batch" package PublicInbox::GitAsyncCat; use v5.12; -use parent qw(PublicInbox::DS Exporter); -use POSIX qw(WNOHANG); -use PublicInbox::Syscall qw(EPOLLIN EPOLLET); +use parent qw(Exporter); our @EXPORT = qw(ibx_async_cat ibx_async_prefetch async_check); -use PublicInbox::Git (); our $GCF2C; # singleton PublicInbox::Gcf2Client -sub close { - my ($self) = @_; - if (my $git = delete $self->{git}) { - $git->async_abort; - } - $self->SUPER::close; # PublicInbox::DS::close -} - -sub event_step { - my ($self) = @_; - my $git = $self->{git} or return; - return $self->close if ($git->{in} // 0) != ($self->{sock} // 1); - my $inflight = $git->{inflight}; - if ($inflight && @$inflight) { - $git->cat_async_step($inflight); - - # child death? - if (($git->{in} // 0) != ($self->{sock} // 1)) { - $self->close; - } elsif (@$inflight || exists $git->{rbuf}) { - # ok, more to do, requeue for fairness - $self->requeue; - } - } elsif ((my $pid = waitpid($git->{pid}, WNOHANG)) > 0) { - # May happen if the child process is killed by a BOFH - # (or segfaults) - delete $git->{pid}; - warn "E: git $pid exited with \$?=$?\n"; - $self->close; - } -} - -sub watch_cat { - my ($git) = @_; - $git->{async_cat} //= do { - my $self = bless { git => $git }, __PACKAGE__; - $git->{in}->blocking(0); - $self->SUPER::new($git->{in}, EPOLLIN|EPOLLET); - \undef; # this is a true ref() - }; -} - sub ibx_async_cat ($$$$) { my ($ibx, $oid, $cb, $arg) = @_; - my $git = $ibx->{git} // $ibx->git; + my $isrch = $ibx->{isrch}; + my $git = $isrch ? $isrch->{es}->git : ($ibx->{git} // $ibx->git); # {topdir} means ExtSearch (likely [extindex "all"]) with potentially - # 100K alternates. git(1) has a proposed patch for 100K alternates: - # <https://lore.kernel.org/git/20210624005806.12079-1-e@80x24.org/> - if (!defined($ibx->{topdir}) && !defined($git->{-tmp}) && + # 100K alternates. git v2.33+ can handle 100k alternates fairly well. + if (!$isrch && !defined($ibx->{topdir}) && !defined($git->{-tmp}) && ($GCF2C //= eval { require PublicInbox::Gcf2Client; PublicInbox::Gcf2Client::new(); } // 0)) { # 0: do not retry if libgit2 or Inline::C are missing - $GCF2C->gcf2_async(\"$oid $git->{git_dir}\n", $cb, $arg); + $GCF2C->gcf2_async("$oid $git->{git_dir}\n", $cb, $arg); \undef; } else { # read-only end of git-cat-file pipe $git->cat_async($oid, $cb, $arg); - watch_cat($git); + $git->watch_async; } } sub async_check ($$$$) { - my ($ibx, $oidish, $cb, $arg) = @_; + my ($ibx, $oidish, $cb, $arg) = @_; # $ibx may be $ctx my $git = $ibx->{git} // $ibx->git; $git->check_async($oidish, $cb, $arg); - $git->{async_chk} //= do { - my $self = bless { git => $git }, 'PublicInbox::GitAsyncCheck'; - $git->{in_c}->blocking(0); - $self->SUPER::new($git->{in_c}, EPOLLIN|EPOLLET); - \undef; # this is a true ref() - }; + ($git->{ck} // $git)->watch_async; } # this is safe to call inside $cb, but not guaranteed to enqueue @@ -93,49 +40,14 @@ sub ibx_async_prefetch { my ($ibx, $oid, $cb, $arg) = @_; my $git = $ibx->git; if (!defined($ibx->{topdir}) && $GCF2C) { - if (!@{$GCF2C->{inflight} // []}) { + if (!@{$GCF2C->gcf_inflight // []}) { $oid .= " $git->{git_dir}\n"; - return $GCF2C->gcf2_async(\$oid, $cb, $arg); # true - } - } elsif ($git->{async_cat} && (my $inflight = $git->{inflight})) { - if (!@$inflight) { - print { $git->{out} } $oid, "\n" or - $git->fail("write error: $!"); - return push(@$inflight, $oid, $cb, $arg); + return $GCF2C->gcf2_async($oid, $cb, $arg); # true } + } elsif ($git->{epwatch}) { + return $git->async_prefetch($oid, $cb, $arg); } undef; } 1; -package PublicInbox::GitAsyncCheck; -use v5.12; -our @ISA = qw(PublicInbox::GitAsyncCat); -use POSIX qw(WNOHANG); -use PublicInbox::Syscall qw(EPOLLIN EPOLLET); - -sub event_step { - my ($self) = @_; - my $git = $self->{git} or return; - return $self->close if ($git->{in_c} // 0) != ($self->{sock} // 1); - my $inflight = $git->{inflight_c}; - if ($inflight && @$inflight) { - $git->check_async_step($inflight); - - # child death? - if (($git->{in_c} // 0) != ($self->{sock} // 1)) { - $self->close; - } elsif (@$inflight || exists $git->{rbuf_c}) { - # ok, more to do, requeue for fairness - $self->requeue; - } - } elsif ((my $pid = waitpid($git->{pid_c}, WNOHANG)) > 0) { - # May happen if the child process is killed by a BOFH - # (or segfaults) - delete $git->{pid_c}; - warn "E: git $pid exited with \$?=$?\n"; - $self->close; - } -} - -1; |