X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FGit.pm;h=6a527f82f9145ada72a1abbf053bf1987009283d;hb=55b707d788ce13696e4411389583e720ea6dab01;hp=6a87661c290faaa4ea0275f70a1fe23bf15898ba;hpb=d9aad3a7988262b31ab2171f2c982daf04ac822c;p=public-inbox.git
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 6a87661c..6a527f82 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 all contributors
+# Copyright (C) 2014-2019 all contributors
# License: GPLv2 or later
#
# Used to read files from a git repository without excessive forking.
@@ -10,11 +10,17 @@ package PublicInbox::Git;
use strict;
use warnings;
use POSIX qw(dup2);
-require IO::Handle;
+use IO::Handle; # ->autoflush
use PublicInbox::Spawn qw(spawn popen_rd);
+use PublicInbox::Tmpfile;
use base qw(Exporter);
our @EXPORT_OK = qw(git_unquote git_quote);
+use constant MAX_INFLIGHT =>
+ ($^O eq 'linux' ? 4096 : POSIX::_POSIX_PIPE_BUF())
+ /
+ 65; # SHA-256 hex size + "\n" in preparation for git using non-SHA1
+
my %GIT_ESC = (
a => "\a",
b => "\b",
@@ -108,11 +114,12 @@ sub _bidi_pipe {
my @cmd = (qw(git), "--git-dir=$self->{git_dir}",
qw(-c core.abbrev=40 cat-file), $batch);
- my $redir = { 0 => fileno($out_r), 1 => fileno($in_w) };
+ my $redir = { 0 => $out_r, 1 => $in_w };
if ($err) {
- open(my $fh, '+>', undef) or fail($self, "open.err failed: $!");
+ my $id = "git.$self->{git_dir}$batch.err";
+ my $fh = tmpfile($id) or fail($self, "tmpfile($id): $!");
$self->{$err} = $fh;
- $redir->{2} = fileno($fh);
+ $redir->{2} = $fh;
}
my $p = spawn(\@cmd, undef, $redir);
defined $p or fail($self, "spawn failed: $!");
@@ -122,10 +129,52 @@ sub _bidi_pipe {
$self->{$in} = $in_r;
}
+sub read_cat_in_full ($$$) {
+ my ($self, $in, $left) = @_;
+ my $offset = 0;
+ my $buf = '';
+ while ($left > 0) {
+ my $r = read($in, $buf, $left, $offset);
+ defined($r) or fail($self, "read failed: $!");
+ $r == 0 and fail($self, 'exited unexpectedly');
+ $left -= $r;
+ $offset += $r;
+ }
+ my $r = read($in, my $lf, 1);
+ defined($r) or fail($self, "read failed: $!");
+ fail($self, 'newline missing after blob') if ($r != 1 || $lf ne "\n");
+ \$buf;
+}
+
+sub _cat_async_step ($$$) {
+ my ($self, $inflight, $in) = @_;
+ my $pair = shift @$inflight or die 'BUG: inflight empty';
+ my ($cb, $arg) = @$pair;
+ local $/ = "\n";
+ my $head = $in->getline;
+ $head =~ / missing$/ and return
+ eval { $cb->(undef, undef, undef, undef, $arg) };
+
+ $head =~ /^([0-9a-f]{40}) (\S+) ([0-9]+)$/ or
+ fail($self, "Unexpected result from async git cat-file: $head");
+ my ($oid_hex, $type, $size) = ($1, $2, $3 + 0);
+ my $bref = read_cat_in_full($self, $in, $size);
+ eval { $cb->($bref, $oid_hex, $type, $size, $arg) };
+}
+
+sub cat_async_wait ($) {
+ my ($self) = @_;
+ my $inflight = delete $self->{inflight} or return;
+ my $in = $self->{in};
+ while (scalar(@$inflight)) {
+ _cat_async_step($self, $inflight, $in);
+ }
+}
+
sub cat_file {
my ($self, $obj, $ref) = @_;
my ($retried, $in, $head);
-
+ cat_async_wait($self);
again:
batch_prepare($self);
$self->{out}->print($obj, "\n") or fail($self, "write error: $!");
@@ -145,26 +194,8 @@ again:
fail($self, "Unexpected result from git cat-file: $head");
my $size = $1;
- my $rv;
- my $left = $size;
$$ref = $size if $ref;
-
- my $offset = 0;
- my $buf = '';
- while ($left > 0) {
- my $r = read($in, $buf, $left, $offset);
- defined($r) or fail($self, "read failed: $!");
- $r == 0 and fail($self, 'exited unexpectedly');
- $left -= $r;
- $offset += $r;
- }
- $rv = \$buf;
-
- my $r = read($in, my $lf, 1);
- defined($r) or fail($self, "read failed: $!");
- fail($self, 'newline missing after blob') if ($r != 1 || $lf ne "\n");
-
- $rv;
+ read_cat_in_full($self, $in, $size);
}
sub batch_prepare ($) { _bidi_pipe($_[0], qw(--batch in out pid)) }
@@ -198,12 +229,21 @@ sub _destroy {
my $p = delete $self->{$pid} or return;
delete @$self{($in, $out)};
delete $self->{$err} if $err; # `err_c'
- waitpid $p, 0;
+
+ # PublicInbox::DS may not be loaded
+ eval { PublicInbox::DS::dwaitpid($p, undef, undef) };
+ waitpid($p, 0) if $@; # wait synchronously if not in event loop
+}
+
+sub cat_async_abort ($) {
+ my ($self) = @_;
+ my $inflight = delete $self->{inflight} or die 'BUG: not in async';
+ cleanup($self);
}
sub fail {
my ($self, $msg) = @_;
- cleanup($self);
+ $self->{inflight} ? cat_async_abort($self) : cleanup($self);
die $msg;
}
@@ -256,17 +296,6 @@ sub local_nick ($) {
wantarray ? ($ret) : $ret;
}
-# show the blob URL for cgit/gitweb/whatever
-sub src_blob_url {
- my ($self, $oid) = @_;
- # blob_url_format = "https://example.com/foo.git/blob/%s"
- if (my $bfu = $self->{blob_url_format}) {
- return map { sprintf($_, $oid) } @$bfu if wantarray;
- return sprintf($bfu->[0], $oid);
- }
- local_nick($self);
-}
-
sub host_prefix_url ($$) {
my ($env, $url) = @_;
return $url if index($url, '//') >= 0;
@@ -284,6 +313,25 @@ sub pub_urls {
local_nick($self);
}
+sub cat_async_begin {
+ my ($self) = @_;
+ cleanup($self) if alternates_changed($self);
+ batch_prepare($self);
+ die 'BUG: already in async' if $self->{inflight};
+ $self->{inflight} = [];
+}
+
+sub cat_async ($$$;$) {
+ my ($self, $oid, $cb, $arg) = @_;
+ my $inflight = $self->{inflight} or die 'BUG: not in async';
+ if (scalar(@$inflight) >= MAX_INFLIGHT) {
+ _cat_async_step($self, $inflight, $self->{in});
+ }
+
+ $self->{out}->print($oid, "\n") or fail($self, "write error: $!");
+ push(@$inflight, [ $cb, $arg ]);
+}
+
sub commit_title ($$) {
my ($self, $oid) = @_; # PublicInbox::Git, $sha1hex
my $buf = cat_file($self, $oid) or return;
@@ -303,7 +351,7 @@ sub modified ($) {
chomp $oid;
my $buf = cat_file($self, $oid) or next;
$$buf =~ /^committer .*?> ([0-9]+) [\+\-]?[0-9]+/sm or next;
- my $cmt_time = $1;
+ my $cmt_time = $1 + 0;
$modified = $cmt_time if $cmt_time > $modified;
}
$modified || time;