-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
# License: GPLv2 or later <https://www.gnu.org/licenses/gpl-2.0.txt>
#
# Used to read files from a git repository without excessive forking.
package PublicInbox::Git;
use strict;
use warnings;
-use POSIX qw(dup2);
+use POSIX ();
use IO::Handle; # ->autoflush
-use PublicInbox::Spawn qw(spawn popen_rd);
+use File::Glob qw(bsd_glob GLOB_NOSORT);
+use PublicInbox::Spawn qw(popen_rd);
use PublicInbox::Tmpfile;
use base qw(Exporter);
our @EXPORT_OK = qw(git_unquote git_quote);
+use Errno qw(EINTR);
+our $PIPE_BUFSIZ = 65536; # Linux default
use constant MAX_INFLIGHT =>
- ($^O eq 'linux' ? 4096 : POSIX::_POSIX_PIPE_BUF())
+ (($^O eq 'linux' ? 4096 : POSIX::_POSIX_PIPE_BUF()) * 2)
/
65; # SHA-256 hex size + "\n" in preparation for git using non-SHA1
sub new {
my ($class, $git_dir) = @_;
- my @st;
- $st[7] = $st[10] = 0;
# may contain {-tmp} field for File::Temp::Dir
- bless { git_dir => $git_dir, st => \@st, -git_path => {} }, $class
+ bless { git_dir => $git_dir, alt_st => '', -git_path => {} }, $class
}
sub git_path ($$) {
my ($self) = @_;
my $alt = git_path($self, 'objects/info/alternates');
my @st = stat($alt) or return 0;
- my $old_st = $self->{st};
- # 10 - ctime, 7 - size
- return 0 if ($st[10] == $old_st->[10] && $st[7] == $old_st->[7]);
- $self->{st} = \@st;
+
+ # can't rely on 'q' on some 32-bit builds, but `d' works
+ my $st = pack('dd', $st[10], $st[7]); # 10: ctime, 7: size
+ return 0 if $self->{alt_st} eq $st;
+ $self->{alt_st} = $st; # always a true value
}
sub last_check_err {
}
return;
}
- my ($in_r, $in_w, $out_r, $out_w);
-
- pipe($in_r, $in_w) or fail($self, "pipe failed: $!");
+ my ($out_r, $out_w);
pipe($out_r, $out_w) or fail($self, "pipe failed: $!");
- if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ
- fcntl($out_w, 1031, 4096);
- fcntl($in_w, 1031, 4096) if $batch eq '--batch-check';
- }
-
my @cmd = (qw(git), "--git-dir=$self->{git_dir}",
qw(-c core.abbrev=40 cat-file), $batch);
- my $redir = { 0 => $out_r, 1 => $in_w };
+ my $redir = { 0 => $out_r };
if ($err) {
my $id = "git.$self->{git_dir}$batch.err";
my $fh = tmpfile($id) or fail($self, "tmpfile($id): $!");
$self->{$err} = $fh;
$redir->{2} = $fh;
}
- my $p = spawn(\@cmd, undef, $redir);
+ my ($in_r, $p) = popen_rd(\@cmd, undef, $redir);
$self->{$pid} = $p;
$out_w->autoflush(1);
+ if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ
+ fcntl($out_w, 1031, 4096);
+ fcntl($in_r, 1031, 4096) if $batch eq '--batch-check';
+ }
+ $self->{$batch} = \(my $rbuf = '');
$self->{$out} = $out_w;
$self->{$in} = $in_r;
}
-sub read_cat_in_full ($$$) {
- my ($self, $in, $left) = @_;
- my $offset = 0;
- my $buf = '';
+sub my_read ($$$) {
+ my ($fh, $rbuf, $len) = @_;
+ my $left = $len - length($$rbuf);
+ my $r;
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;
+ $r = sysread($fh, $$rbuf, $PIPE_BUFSIZ, length($$rbuf));
+ if ($r) {
+ $left -= $r;
+ } else {
+ next if (!defined($r) && $! == EINTR);
+ return $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;
+ \substr($$rbuf, 0, $len, '');
}
-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;
+sub my_readline ($$) {
+ my ($fh, $rbuf) = @_;
+ while (1) {
+ if ((my $n = index($$rbuf, "\n")) >= 0) {
+ return substr($$rbuf, 0, $n + 1, '');
+ }
+ my $r = sysread($fh, $$rbuf, $PIPE_BUFSIZ, length($$rbuf));
+ next if $r || (!defined($r) && $! == EINTR);
+ return defined($r) ? '' : undef; # EOF or error
+ }
+}
+
+sub cat_async_step ($$) {
+ my ($self, $inflight) = @_;
+ die 'BUG: inflight empty or odd' if scalar(@$inflight) < 2;
+ my ($cb, $arg) = splice(@$inflight, 0, 2);
+ my $head = my_readline($self->{in}, $self->{'--batch'});
$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) };
+ my $ret = my_read($self->{in}, $self->{'--batch'}, $size + 1);
+ fail($self, defined($ret) ? 'read EOF' : "read: $!") if !$ret;
+ chop($$ret) eq "\n" or fail($self, 'newline missing after blob');
+ eval { $cb->($ret, $oid_hex, $type, $size, $arg) };
+ warn "E: $oid_hex $@\n" if $@;
}
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);
+ cat_async_step($self, $inflight);
}
}
+sub batch_prepare ($) {
+ _bidi_pipe($_[0], qw(--batch in out pid));
+}
+
sub cat_file {
- my ($self, $obj, $ref) = @_;
- my ($retried, $in, $head);
+ my ($self, $obj, $sizeref) = @_;
+ my ($retried, $head);
cat_async_wait($self);
again:
batch_prepare($self);
- $self->{out}->print($obj, "\n") or fail($self, "write error: $!");
-
- $in = $self->{in};
- local $/ = "\n";
- $head = $in->getline;
+ print { $self->{out} } $obj, "\n" or fail($self, "write error: $!");
+ $head = my_readline($self->{in}, $self->{'--batch'});
if ($head =~ / missing$/) {
if (!$retried && alternates_changed($self)) {
$retried = 1;
$head =~ /^[0-9a-f]{40} \S+ ([0-9]+)$/ or
fail($self, "Unexpected result from git cat-file: $head");
- my $size = $1;
- $$ref = $size if $ref;
- read_cat_in_full($self, $in, $size);
+ my $size = $1 + 0;
+ $$sizeref = $size if $sizeref;
+ my $ret = my_read($self->{in}, $self->{'--batch'}, $size + 1);
+ fail($self, defined($ret) ? 'read EOF' : "read: $!") if !$ret;
+ chop($$ret) eq "\n" or fail($self, 'newline missing after blob');
+ $ret;
}
-sub batch_prepare ($) { _bidi_pipe($_[0], qw(--batch in out pid)) }
-
sub check {
my ($self, $obj) = @_;
_bidi_pipe($self, qw(--batch-check in_c out_c pid_c err_c));
- $self->{out_c}->print($obj, "\n") or fail($self, "write error: $!");
- local $/ = "\n";
- chomp(my $line = $self->{in_c}->getline);
+ print { $self->{out_c} } $obj, "\n" or fail($self, "write error: $!");
+ chomp(my $line = my_readline($self->{in_c}, $self->{'--batch-check'}));
my ($hex, $type, $size) = split(' ', $line);
# Future versions of git.git may show 'ambiguous', but for now,
return if $type eq 'missing' || $type eq 'ambiguous';
if ($hex eq 'dangling' || $hex eq 'notdir' || $hex eq 'loop') {
- $size = $type + length("\n");
- my $r = read($self->{in_c}, my $buf, $size);
- defined($r) or fail($self, "read failed: $!");
+ my $ret = my_read($self->{in_c}, $self->{'--batch-check'},
+ $type + 1);
+ fail($self, defined($ret) ? 'read EOF' : "read: $!") if !$ret;
return;
}
}
sub _destroy {
- my ($self, $in, $out, $pid, $err) = @_;
+ my ($self, $batch, $in, $out, $pid, $err) = @_;
my $p = delete $self->{$pid} or return;
- delete @$self{($in, $out)};
+ delete @$self{($batch, $in, $out)};
delete $self->{$err} if $err; # `err_c'
# PublicInbox::DS may not be loaded
# returns true if there are pending "git cat-file" processes
sub cleanup {
my ($self) = @_;
- _destroy($self, qw(in out pid));
- _destroy($self, qw(in_c out_c pid_c err_c));
+ cat_async_wait($self);
+ _destroy($self, qw(--batch in out pid));
+ _destroy($self, qw(--batch-check in_c out_c pid_c err_c));
!!($self->{pid} || $self->{pid_c});
}
my ($self) = @_;
my $n = 0;
my $pack_dir = git_path($self, 'objects/pack');
- foreach my $p (glob("$pack_dir/*.pack")) {
+ foreach my $p (bsd_glob("$pack_dir/*.pack", GLOB_NOSORT)) {
$n += -s $p;
}
$n
sub cat_async ($$$;$) {
my ($self, $oid, $cb, $arg) = @_;
- my $inflight = $self->{inflight} or die 'BUG: not in async';
+ my $inflight = $self->{inflight} // cat_async_begin($self);
if (scalar(@$inflight) >= MAX_INFLIGHT) {
- _cat_async_step($self, $inflight, $self->{in});
+ cat_async_step($self, $inflight);
}
- $self->{out}->print($oid, "\n") or fail($self, "write error: $!");
- push(@$inflight, [ $cb, $arg ]);
+ print { $self->{out} } $oid, "\n" or fail($self, "write error: $!");
+ push(@$inflight, $cb, $arg);
}
sub extract_cmt_time {
my ($self) = @_;
my $modified = 0;
my $fh = popen($self, qw(rev-parse --branches));
- cat_async_begin($self);
local $/ = "\n";
- foreach my $oid (<$fh>) {
+ while (my $oid = <$fh>) {
chomp $oid;
cat_async($self, $oid, \&extract_cmt_time, \$modified);
}