diff options
Diffstat (limited to 'lib/PublicInbox/Git.pm')
| -rw-r--r-- | lib/PublicInbox/Git.pm | 634 |
1 files changed, 370 insertions, 264 deletions
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index b2ae75c8..aea389e8 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -9,27 +9,34 @@ package PublicInbox::Git; use strict; use v5.10.1; -use parent qw(Exporter); +use parent qw(Exporter PublicInbox::DS); +use autodie qw(socketpair read); use POSIX (); -use IO::Handle; # ->autoflush -use Errno qw(EINTR EAGAIN ENOENT); +use Socket qw(AF_UNIX SOCK_STREAM); +use PublicInbox::Syscall qw(EPOLLIN EPOLLET); +use Errno qw(EAGAIN); use File::Glob qw(bsd_glob GLOB_NOSORT); use File::Spec (); -use Time::HiRes qw(stat); -use PublicInbox::Spawn qw(popen_rd spawn); +use PublicInbox::Spawn qw(spawn popen_rd run_qx which); +use PublicInbox::IO qw(read_all try_cat); use PublicInbox::Tmpfile; -use IO::Poll qw(POLLIN); use Carp qw(croak carp); -use Digest::SHA (); -use PublicInbox::DS qw(dwaitpid); -our @EXPORT_OK = qw(git_unquote git_quote); -our $PIPE_BUFSIZ = 65536; # Linux default +use PublicInbox::SHA qw(sha_all); +our %HEXLEN2SHA = (40 => 1, 64 => 256); +our %OFMT2HEXLEN = (sha1 => 40, sha256 => 64); +our @EXPORT_OK = qw(git_unquote git_quote %HEXLEN2SHA %OFMT2HEXLEN + $ck_unlinked_packs); our $in_cleanup; -our $RDTIMEO = 60_000; # milliseconds our $async_warn; # true in read-only daemons -use constant MAX_INFLIGHT => (POSIX::PIPE_BUF * 3) / - 65; # SHA-256 hex size + "\n" in preparation for git using non-SHA1 +# committerdate:unix is git 2.9.4+ (2017-05-05), so using raw instead +my @MODIFIED_DATE = qw[for-each-ref --sort=-committerdate + --format=%(committerdate:raw) --count=1]; + +use constant { + MAX_INFLIGHT => 18, # arbitrary, formerly based on PIPE_BUF + BATCH_CMD_VER => v2.36.0, # git 2.36+ +}; my %GIT_ESC = ( a => "\a", @@ -44,6 +51,28 @@ my %GIT_ESC = ( ); my %ESC_GIT = map { $GIT_ESC{$_} => $_ } keys %GIT_ESC; +my $EXE_ST = ''; # pack('dd', st_dev, st_ino); # no `q' in some 32-bit builds +my ($GIT_EXE, $GIT_VER); + +sub check_git_exe () { + $GIT_EXE = which('git') // die "git not found in $ENV{PATH}"; + my @st = stat(_) or die "stat($GIT_EXE): $!"; # can't do HiRes w/ _ + my $st = pack('dd', $st[0], $st[1]); + if ($st ne $EXE_ST) { + my $v = run_qx([ $GIT_EXE, '--version' ]); + die "$GIT_EXE --version: \$?=$?" if $?; + $v =~ /\b([0-9]+(?:\.[0-9]+){2})/ or die + "$GIT_EXE --version output: $v # unparseable"; + $GIT_VER = eval("v$1") // die "BUG: bad vstring: $1 ($v)"; + $EXE_ST = $st; + } + $GIT_EXE; +} + +sub git_version { + check_git_exe(); + $GIT_VER; +} # unquote pathnames used by git, see quote.c::unquote_c_style.c in git.git sub git_unquote ($) { @@ -63,34 +92,42 @@ sub git_quote ($) { sub new { my ($class, $git_dir) = @_; + $git_dir .= '/'; $git_dir =~ tr!/!/!s; - $git_dir =~ s!/*\z!!s; + chop $git_dir; # may contain {-tmp} field for File::Temp::Dir - bless { git_dir => $git_dir, alt_st => '', -git_path => {} }, $class + my %dedupe = ($git_dir => undef); + bless { git_dir => (keys %dedupe)[0] }, $class } sub git_path ($$) { my ($self, $path) = @_; $self->{-git_path}->{$path} //= do { - local $/ = "\n"; - chomp(my $str = $self->qx(qw(rev-parse --git-path), $path)); - - # git prior to 2.5.0 did not understand --git-path - if ($str eq "--git-path\n$path") { - $str = "$self->{git_dir}/$path"; + my $d = "$self->{git_dir}/$path"; + if (-e $d) { + $d; + } else { + local $/ = "\n"; + my $rdr = { 2 => \my $err }; + my $s = $self->qx([qw(rev-parse --git-path), $path], + undef, $rdr); + chomp $s; + + # git prior to 2.5.0 did not understand --git-path + $s eq "--git-path\n$path" ? $d : $s; } - $str; }; } sub alternates_changed { my ($self) = @_; my $alt = git_path($self, 'objects/info/alternates'); + use Time::HiRes qw(stat); my @st = stat($alt) or return 0; # 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; + return 0 if ($self->{alt_st} // '') eq $st; $self->{alt_st} = $st; # always a true value } @@ -103,124 +140,124 @@ sub object_format { sub last_check_err { my ($self) = @_; - my $fh = $self->{err_c} or return; - sysseek($fh, 0, 0) or $self->fail("sysseek failed: $!"); - defined(sysread($fh, my $buf, -s $fh)) or - $self->fail("sysread failed: $!"); + my $fh = $self->{err_c} or return ''; + sysseek($fh, 0, 0) or $self->fail("sysseek: $!"); + my $size = -s $fh or return ''; + sysread($fh, my $buf, $size) // $self->fail("sysread: $!"); + truncate($fh, 0) or $self->fail("truncate: $!"); $buf; } -sub _bidi_pipe { - my ($self, $batch, $in, $out, $pid, $err) = @_; - if ($self->{$pid}) { - if (defined $err) { # "err_c" - my $fh = $self->{$err}; - sysseek($fh, 0, 0) or $self->fail("sysseek failed: $!"); - truncate($fh, 0) or $self->fail("truncate failed: $!"); - } - return; +sub gcf_drain { # awaitpid cb + my ($pid, $inflight, $bc) = @_; + while (@$inflight) { + my ($req, $cb, $arg) = splice(@$inflight, 0, 3); + $req = $$req if ref($req); + $bc and $req =~ s/\A(?:contents|info) //; + $req =~ s/ .*//; # drop git_dir for Gcf2Client + eval { $cb->(undef, $req, undef, undef, $arg) }; + warn "E: (in abort) $req: $@" if $@; } - pipe(my ($out_r, $out_w)) or $self->fail("pipe failed: $!"); - my $rdr = { 0 => $out_r, pgid => 0 }; +} + +sub _sock_cmd { + my ($self, $batch, $err_c) = @_; + $self->{sock} and Carp::confess('BUG: {sock} exists'); + socketpair(my $s1, my $s2, AF_UNIX, SOCK_STREAM, 0); + $s1->blocking(0); + my $opt = { pgid => 0, 0 => $s2, 1 => $s2 }; my $gd = $self->{git_dir}; if ($gd =~ s!/([^/]+/[^/]+)\z!/!) { - $rdr->{-C} = $gd; + $opt->{-C} = $gd; $gd = $1; } - my @cmd = (qw(git), "--git-dir=$gd", - qw(-c core.abbrev=40 cat-file), $batch); - if ($err) { - my $id = "git.$self->{git_dir}$batch.err"; - my $fh = tmpfile($id) or $self->fail("tmpfile($id): $!"); - $self->{$err} = $fh; - $rdr->{2} = $fh; - } - my ($in_r, $p) = popen_rd(\@cmd, undef, $rdr); - $self->{$pid} = $p; - $self->{"$pid.owner"} = $$; - $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->{$out} = $out_w; - $self->{$in} = $in_r; -} - -sub poll_in ($) { IO::Poll::_poll($RDTIMEO, fileno($_[0]), my $ev = POLLIN) } - -sub my_read ($$$) { - my ($fh, $rbuf, $len) = @_; - my $left = $len - length($$rbuf); - my $r; - while ($left > 0) { - $r = sysread($fh, $$rbuf, $PIPE_BUFSIZ, length($$rbuf)); - if ($r) { - $left -= $r; - } elsif (defined($r)) { # EOF - return 0; - } else { - next if ($! == EAGAIN and poll_in($fh)); - next if $! == EINTR; # may be set by sysread or poll_in - return; # unrecoverable error - } - } - my $no_pad = substr($$rbuf, 0, $len, ''); - \$no_pad; -} - -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)) - and next; - # return whatever's left on EOF - return substr($$rbuf, 0, length($$rbuf)+1, '') if defined($r); - - next if ($! == EAGAIN and poll_in($fh)); - next if $! == EINTR; # may be set by sysread or poll_in - return; # unrecoverable error + # git 2.31.0+ supports -c core.abbrev=no, don't bother with + # core.abbrev=64 since not many releases had SHA-256 prior to 2.31 + my $abbr = $GIT_VER lt v2.31.0 ? 40 : 'no'; + my @cmd = ($GIT_EXE, "--git-dir=$gd", '-c', "core.abbrev=$abbr", + 'cat-file', "--$batch"); + if ($err_c) { + my $id = "git.$self->{git_dir}.$batch.err"; + $self->{err_c} = $opt->{2} = tmpfile($id, undef, 1) or + $self->fail("tmpfile($id): $!"); } + my $inflight = []; # TODO consider moving this into the IO object + my $pid = spawn(\@cmd, undef, $opt); + $self->{sock} = PublicInbox::IO::attach_pid($s1, $pid, + \&gcf_drain, $inflight, $self->{-bc}); + $self->{inflight} = $inflight; } sub cat_async_retry ($$) { - my ($self, $inflight) = @_; + my ($self, $old_inflight) = @_; # {inflight} may be non-existent, but if it isn't we delete it # here to prevent cleanup() from waiting: - delete $self->{inflight}; - cleanup($self); + my ($sock, $epwatch) = delete @$self{qw(sock epwatch inflight)}; + $self->SUPER::close if $epwatch; + my $new_inflight = batch_prepare($self); + + while (my ($oid, $cb, $arg) = splice(@$old_inflight, 0, 3)) { + write_all($self, $oid."\n", \&cat_async_step, $new_inflight); + $oid = \$oid if !@$new_inflight; # to indicate oid retried + push @$new_inflight, $oid, $cb, $arg; + } + $sock->close if $sock; # only safe once old_inflight is empty + cat_async_step($self, $new_inflight); # take one step +} - $self->{inflight} = $inflight; - batch_prepare($self); - my $buf = ''; - for (my $i = 0; $i < @$inflight; $i += 3) { - $buf .= "$inflight->[$i]\n"; +sub gcf_inflight ($) { + my ($self) = @_; + # FIXME: the first {sock} check can succeed but Perl can complain + # about an undefined value. Not sure why or how this happens but + # t/imapd.t can complain about it, sometimes. + if ($self->{sock}) { + if (eval { $self->{sock}->can_reap }) { + return $self->{inflight}; + } elsif ($@) { + no warnings 'uninitialized'; + warn "E: $self sock=$self->{sock}: can_reap failed: ". + "$@ (continuing...)"; + } + delete @$self{qw(sock inflight)}; + } else { + $self->close; } - print { $self->{out} } $buf or $self->fail("write error: $!"); - my $req = shift @$inflight; - unshift(@$inflight, \$req); # \$ref to indicate retried + undef; +} - cat_async_step($self, $inflight); # take one step +# returns true if prefetch is successful +sub async_prefetch { + my ($self, $oid, $cb, $arg) = @_; + my $inflight = gcf_inflight($self) or return; + return if @$inflight; + substr($oid, 0, 0) = 'contents ' if $self->{-bc}; + write_all($self, "$oid\n", \&cat_async_step, $inflight); + push(@$inflight, $oid, $cb, $arg); } sub cat_async_step ($$) { my ($self, $inflight) = @_; - die 'BUG: inflight empty or odd' if scalar(@$inflight) < 3; + croak 'BUG: inflight empty or odd' if scalar(@$inflight) < 3; my ($req, $cb, $arg) = @$inflight[0, 1, 2]; - my $rbuf = delete($self->{rbuf}) // \(my $new = ''); my ($bref, $oid, $type, $size); - my $head = my_readline($self->{in}, $rbuf); + my $head = $self->{sock}->my_readline; + my $cmd = ref($req) ? $$req : $req; # ->fail may be called via Gcf2Client.pm + my $info = $self->{-bc} && substr($cmd, 0, 5) eq 'info '; if ($head =~ /^([0-9a-f]{40,}) (\S+) ([0-9]+)$/) { ($oid, $type, $size) = ($1, $2, $3 + 0); - $bref = my_read($self->{in}, $rbuf, $size + 1) or - $self->fail(defined($bref) ? 'read EOF' : "read: $!"); - chop($$bref) eq "\n" or $self->fail('LF missing after blob'); + unless ($info) { # --batch-command + $bref = $self->{sock}->my_bufread($size + 1) or + $self->fail(defined($bref) ? + 'read EOF' : "read: $!"); + chop($$bref) eq "\n" or + $self->fail('LF missing after blob'); + } + } elsif ($info && $head =~ / (missing|ambiguous)\n/) { + $type = $1; + $oid = substr($cmd, 5); # remove 'info ' } elsif ($head =~ s/ missing\n//s) { $oid = $head; # ref($req) indicates it's already been retried @@ -229,27 +266,34 @@ sub cat_async_step ($$) { return cat_async_retry($self, $inflight); } $type = 'missing'; - $oid = ref($req) ? $$req : $req if $oid eq ''; + if ($oid eq '') { + $oid = $cmd; + $oid =~ s/\A(?:contents|info) // if $self->{-bc}; + } } else { my $err = $! ? " ($!)" : ''; $self->fail("bad result from async cat-file: $head$err"); } - $self->{rbuf} = $rbuf if $$rbuf ne ''; splice(@$inflight, 0, 3); # don't retry $cb on ->fail eval { $cb->($bref, $oid, $type, $size, $arg) }; - async_err($self, $req, $oid, $@, 'cat') if $@; + async_err($self, $req, $oid, $@, $info ? 'check' : 'cat') if $@; } sub cat_async_wait ($) { my ($self) = @_; - my $inflight = $self->{inflight} or return; - while (scalar(@$inflight)) { - cat_async_step($self, $inflight); - } + my $inflight = gcf_inflight($self) or return; + cat_async_step($self, $inflight) while (scalar(@$inflight)); } sub batch_prepare ($) { - _bidi_pipe($_[0], qw(--batch in out pid)); + my ($self) = @_; + check_git_exe(); + if ($GIT_VER ge BATCH_CMD_VER) { + $self->{-bc} = 1; + _sock_cmd($self, 'batch-command', 1); + } else { + _sock_cmd($self, 'batch'); + } } sub _cat_file_cb { @@ -266,55 +310,86 @@ sub cat_file { } sub check_async_step ($$) { - my ($self, $inflight_c) = @_; - die 'BUG: inflight empty or odd' if scalar(@$inflight_c) < 3; - my ($req, $cb, $arg) = @$inflight_c[0, 1, 2]; - my $rbuf = delete($self->{rbuf_c}) // \(my $new = ''); - chomp(my $line = my_readline($self->{in_c}, $rbuf)); + my ($ck, $inflight) = @_; + croak 'BUG: inflight empty or odd' if scalar(@$inflight) < 3; + my ($req, $cb, $arg) = @$inflight[0, 1, 2]; + chomp(my $line = $ck->{sock}->my_readline); my ($hex, $type, $size) = split(/ /, $line); - # Future versions of git.git may have type=ambiguous, but for now, - # we must handle 'dangling' below (and maybe some other oddball - # stuff): + # git <2.21 would show `dangling' (2.21+ shows `ambiguous') # https://public-inbox.org/git/20190118033845.s2vlrb3wd3m2jfzu@dcvr/T/ - if ($hex eq 'dangling' || $hex eq 'notdir' || $hex eq 'loop') { - my $ret = my_read($self->{in_c}, $rbuf, $type + 1); - $self->fail(defined($ret) ? 'read EOF' : "read: $!") if !$ret; + if ($hex eq 'dangling') { + my $ret = $ck->{sock}->my_bufread($type + 1); + $ck->fail(defined($ret) ? 'read EOF' : "read: $!") if !$ret; } - $self->{rbuf_c} = $rbuf if $$rbuf ne ''; - splice(@$inflight_c, 0, 3); # don't retry $cb on ->fail - eval { $cb->($hex, $type, $size, $arg, $self) }; - async_err($self, $req, $hex, $@, 'check') if $@; + splice(@$inflight, 0, 3); # don't retry $cb on ->fail + eval { $cb->(undef, $hex, $type, $size, $arg) }; + async_err($ck, $req, $hex, $@, 'check') if $@; } sub check_async_wait ($) { my ($self) = @_; - my $inflight_c = $self->{inflight_c} or return; - while (scalar(@$inflight_c)) { - check_async_step($self, $inflight_c); - } + return cat_async_wait($self) if $self->{-bc}; + my $ck = $self->{ck} or return; + my $inflight = gcf_inflight($ck) or return; + check_async_step($ck, $inflight) while (scalar(@$inflight)); +} + +# git <2.36 +sub ck { + $_[0]->{ck} //= bless { git_dir => $_[0]->{git_dir} }, + 'PublicInbox::GitCheck'; } sub check_async_begin ($) { my ($self) = @_; cleanup($self) if alternates_changed($self); - _bidi_pipe($self, qw(--batch-check in_c out_c pid_c err_c)); - die 'BUG: already in async check' if $self->{inflight_c}; - $self->{inflight_c} = []; + check_git_exe(); + if ($GIT_VER ge BATCH_CMD_VER) { + $self->{-bc} = 1; + _sock_cmd($self, 'batch-command', 1); + } else { + _sock_cmd($self = ck($self), 'batch-check', 1); + } +} + +sub write_all { + my ($self, $buf, $read_step, $inflight) = @_; + $self->{sock} // Carp::confess 'BUG: no {sock}'; + Carp::confess('BUG: not an array') if ref($inflight) ne 'ARRAY'; + $read_step->($self, $inflight) while @$inflight >= MAX_INFLIGHT; + do { + my $w = syswrite($self->{sock}, $buf); + if (defined $w) { + return if $w == length($buf); + substr($buf, 0, $w, ''); # sv_chop + } elsif ($! != EAGAIN) { + $self->fail("write: $!"); + } + $read_step->($self, $inflight); + } while (1); } sub check_async ($$$$) { my ($self, $oid, $cb, $arg) = @_; - my $inflight_c = $self->{inflight_c} // check_async_begin($self); - while (scalar(@$inflight_c) >= MAX_INFLIGHT) { - check_async_step($self, $inflight_c); + my $inflight; + if ($self->{-bc}) { # likely as time goes on +batch_command: + $inflight = gcf_inflight($self) // cat_async_begin($self); + substr($oid, 0, 0) = 'info '; + write_all($self, "$oid\n", \&cat_async_step, $inflight); + } else { # accounts for git upgrades while we're running: + my $ck = $self->{ck}; # undef OK, maybe set in check_async_begin + $inflight = ($ck ? gcf_inflight($ck) : undef) + // check_async_begin($self); + goto batch_command if $self->{-bc}; + write_all($self->{ck}, "$oid\n", \&check_async_step, $inflight); } - print { $self->{out_c} } $oid, "\n" or $self->fail("write error: $!"); - push(@$inflight_c, $oid, $cb, $arg); + push(@$inflight, $oid, $cb, $arg); } sub _check_cb { # check_async callback - my ($hex, $type, $size, $result) = @_; + my (undef, $hex, $type, $size, $result) = @_; @$result = ($hex, $type, $size); } @@ -325,48 +400,15 @@ sub check { check_async_wait($self); my ($hex, $type, $size) = @$result; - # Future versions of git.git may show 'ambiguous', but for now, - # we must handle 'dangling' below (and maybe some other oddball - # stuff): + # git <2.21 would show `dangling' (2.21+ shows `ambiguous') # https://public-inbox.org/git/20190118033845.s2vlrb3wd3m2jfzu@dcvr/T/ - return if $type eq 'missing' || $type eq 'ambiguous'; - return if $hex eq 'dangling' || $hex eq 'notdir' || $hex eq 'loop'; + return if $type =~ /\A(?:missing|ambiguous)\z/ || $hex eq 'dangling'; ($hex, $type, $size); } -sub _destroy { - my ($self, $rbuf, $in, $out, $pid, $err) = @_; - delete @$self{($rbuf, $in, $out)}; - delete $self->{$err} if $err; # `err_c' - - # GitAsyncCat::event_step may delete {pid} - my $p = delete $self->{$pid} or return; - dwaitpid($p) if $$ == $self->{"$pid.owner"}; -} - -sub async_abort ($) { - my ($self) = @_; - while (scalar(@{$self->{inflight_c} // []}) || - scalar(@{$self->{inflight} // []})) { - for my $c ('', '_c') { - my $q = $self->{"inflight$c"} or next; - while (@$q) { - my ($req, $cb, $arg) = splice(@$q, 0, 3); - $req = $$req if ref($req); - $req =~ s/ .*//; # drop git_dir for Gcf2Client - eval { $cb->(undef, $req, undef, undef, $arg) }; - warn "E: (in abort) $req: $@" if $@; - } - delete $self->{"inflight$c"}; - delete $self->{"rbuf$c"}; - } - } - cleanup($self); -} - -sub fail { # may be augmented in subclasses +sub fail { my ($self, $msg) = @_; - async_abort($self); + $self->close; croak(ref($self) . ' ' . ($self->{git_dir} // '') . ": $msg"); } @@ -377,6 +419,11 @@ sub async_err ($$$$$) { $async_warn ? carp($msg) : $self->fail($msg); } +sub cmd { + my $self = shift; + [ $GIT_EXE // check_git_exe(), "--git-dir=$self->{git_dir}", @_ ] +} + # $git->popen(qw(show f00)); # or # $git->popen(qw(show f00), { GIT_CONFIG => ... }, { 2 => ... }); sub popen { @@ -391,12 +438,12 @@ sub qx { my $fh = popen(@_); if (wantarray) { my @ret = <$fh>; - close $fh; # caller should check $? + $fh->close; # caller should check $? @ret; } else { local $/; my $ret = <$fh>; - close $fh; # caller should check $? + $fh->close; # caller should check $? $ret; } } @@ -408,12 +455,16 @@ sub date_parse { } $self->qx('rev-parse', map { "--since=$_" } @_); } +sub _active ($) { + scalar(@{gcf_inflight($_[0]) // []}) || + ($_[0]->{ck} && scalar(@{gcf_inflight($_[0]->{ck}) // []})) +} + # check_async and cat_async may trigger the other, so ensure they're # both completely done by using this: sub async_wait_all ($) { my ($self) = @_; - while (scalar(@{$self->{inflight_c} // []}) || - scalar(@{$self->{inflight} // []})) { + while (_active($self)) { check_async_wait($self); cat_async_wait($self); } @@ -422,15 +473,11 @@ sub async_wait_all ($) { # returns true if there are pending "git cat-file" processes sub cleanup { my ($self, $lazy) = @_; - return 1 if $lazy && (scalar(@{$self->{inflight_c} // []}) || - scalar(@{$self->{inflight} // []})); + ($lazy && _active($self)) and + return $self->{epwatch} ? watch_async($self) : 1; local $in_cleanup = 1; - delete $self->{async_cat}; async_wait_all($self); - delete $self->{inflight}; - delete $self->{inflight_c}; - _destroy($self, qw(rbuf in out pid)); - _destroy($self, qw(rbuf_c in_c out_c pid_c err_c)); + $_->close for ($self, (delete($self->{ck}) // ())); undef; } @@ -441,135 +488,194 @@ sub packed_bytes { my ($self) = @_; my $n = 0; my $pack_dir = git_path($self, 'objects/pack'); - foreach my $p (bsd_glob("$pack_dir/*.pack", GLOB_NOSORT)) { - $n += -s $p; - } + $n += (-s $_ // 0) for (bsd_glob("$pack_dir/*.pack", GLOB_NOSORT)); $n } -sub DESTROY { cleanup(@_) } +sub DESTROY { cleanup($_[0]) } sub local_nick ($) { # don't show full FS path, basename should be OK: - $_[0]->{git_dir} =~ m!/([^/]+?)(?:/*\.git/*)?\z! ? "$1.git" : '???'; + $_[0]->{nick} // ($_[0]->{git_dir} =~ m!/([^/]+?)(?:/*\.git/*)?\z! ? + "$1.git" : undef); } sub host_prefix_url ($$) { my ($env, $url) = @_; return $url if index($url, '//') >= 0; - my $scheme = $env->{'psgi.url_scheme'}; my $host_port = $env->{HTTP_HOST} // "$env->{SERVER_NAME}:$env->{SERVER_PORT}"; - "$scheme://$host_port". ($env->{SCRIPT_NAME} || '/') . $url; + my $sn = $env->{SCRIPT_NAME} // ''; + "$env->{'psgi.url_scheme'}://\L$host_port\E$sn/$url"; +} + +sub base_url { # for coderepos, PSGI-only + my ($self, $env) = @_; # env - PSGI env + my $nick = $self->{nick} // return undef; + my $url = host_prefix_url($env, ''); + # for mount in Plack::Builder + $url .= '/' if substr($url, -1, 1) ne '/'; + $url . $nick . '/'; } +sub isrch {} # TODO + sub pub_urls { my ($self, $env) = @_; if (my $urls = $self->{cgit_url}) { - return map { host_prefix_url($env, $_) } @$urls; + map { host_prefix_url($env, $_) } @$urls; + } else { + (base_url($self, $env) // '???'); } - (local_nick($self)); } sub cat_async_begin { my ($self) = @_; cleanup($self) if $self->alternates_changed; - $self->batch_prepare; - die 'BUG: already in async' if $self->{inflight}; - $self->{inflight} = []; + die 'BUG: already in async' if gcf_inflight($self); + batch_prepare($self); } sub cat_async ($$$;$) { my ($self, $oid, $cb, $arg) = @_; - my $inflight = $self->{inflight} // cat_async_begin($self); - while (scalar(@$inflight) >= MAX_INFLIGHT) { - cat_async_step($self, $inflight); - } - print { $self->{out} } $oid, "\n" or $self->fail("write error: $!"); + my $inflight = gcf_inflight($self) // cat_async_begin($self); + substr($oid, 0, 0) = 'contents ' if $self->{-bc}; + write_all($self, $oid."\n", \&cat_async_step, $inflight); push(@$inflight, $oid, $cb, $arg); } # returns the modified time of a git repo, same as the "modified" field # of a grokmirror manifest -sub modified ($) { - # committerdate:unix is git 2.9.4+ (2017-05-05), so using raw instead - my $fh = popen($_[0], qw[for-each-ref --sort=-committerdate - --format=%(committerdate:raw) --count=1]); +sub modified ($;$) { + my $fh = $_[1] // popen($_[0], @MODIFIED_DATE); (split(/ /, <$fh> // time))[0] + 0; # integerize for JSON } +sub cat_desc ($) { + my $desc = try_cat($_[0]); + chomp $desc; + utf8::decode($desc); + $desc =~ s/\s+/ /smg; + $desc eq '' ? undef : $desc; +} + +sub description { + cat_desc("$_[0]->{git_dir}/description") // 'Unnamed repository'; +} + +sub cloneurl { + my ($self, $env) = @_; + $self->{cloneurl} // do { + my @urls = split(/\s+/s, try_cat("$self->{git_dir}/cloneurl")); + scalar(@urls) ? ($self->{cloneurl} = \@urls) : undef; + } // [ substr(base_url($self, $env), 0, -1) ]; +} + # for grokmirror, which doesn't read gitweb.description # templates/hooks--update.sample and git-multimail in git.git # only match "Unnamed repository", not the full contents of # templates/this--description in git.git sub manifest_entry { my ($self, $epoch, $default_desc) = @_; - my $fh = $self->popen('show-ref'); - my $dig = Digest::SHA->new(1); - while (read($fh, my $buf, 65536)) { - $dig->add($buf); - } - close $fh or return; # empty, uninitialized git repo - undef $fh; # for open, below - my $git_dir = $self->{git_dir}; - my $ent = { - fingerprint => $dig->hexdigest, - reference => undef, - modified => modified($self), - }; - chomp(my $owner = $self->qx('config', 'gitweb.owner')); - utf8::decode($owner); - $ent->{owner} = $owner eq '' ? undef : $owner; - my $desc = ''; - if (open($fh, '<', "$git_dir/description")) { - local $/ = "\n"; - chomp($desc = <$fh>); - utf8::decode($desc); - } - $desc = 'Unnamed repository' if $desc eq ''; - if (defined $epoch && $desc =~ /\AUnnamed repository/) { - $desc = "$default_desc [epoch $epoch]"; + check_git_exe(); + my $gd = $self->{git_dir}; + my @git = ($GIT_EXE, "--git-dir=$gd"); + my $sr = popen_rd([@git, 'show-ref']); + my $own = popen_rd([@git, qw(config gitweb.owner)]); + my $mod = popen_rd([@git, @MODIFIED_DATE]); + my $buf = description($self); + if (defined $epoch && index($buf, 'Unnamed repository') == 0) { + $buf = "$default_desc [epoch $epoch]"; } - $ent->{description} = $desc; - if (open($fh, '<', "$git_dir/objects/info/alternates")) { + my $ent = { description => $buf, reference => undef }; + if (open(my $alt, '<', "$gd/objects/info/alternates")) { # n.b.: GitPython doesn't seem to handle comments or C-quoted # strings like native git does; and we don't for now, either. local $/ = "\n"; - chomp(my @alt = <$fh>); + chomp(my @alt = <$alt>); # grokmirror only supports 1 alternate for "reference", if (scalar(@alt) == 1) { - my $objdir = "$git_dir/objects"; - my $ref = File::Spec->rel2abs($alt[0], $objdir); - $ref =~ s!/[^/]+/?\z!!; # basename - $ent->{reference} = $ref; + $buf = File::Spec->rel2abs($alt[0], "$gd/objects"); + $buf =~ s!/[^/]+/?\z!!; # basename + $ent->{reference} = $buf; } } + $ent->{fingerprint} = sha_all(1, $sr)->hexdigest; + $sr->close or return; # empty, uninitialized git repo + $ent->{modified} = modified(undef, $mod); + chomp($buf = <$own> // ''); + utf8::decode($buf); + $ent->{owner} = $buf eq '' ? undef : $buf; $ent; } +our $ck_unlinked_packs = $^O eq 'linux' ? sub { + # FIXME: port gcf2-like over to git.git so we won't need to + # deal with libgit2 + my $s = try_cat "/proc/$_[0]/maps"; + $s =~ /\.(?:idx|pack) \(deleted\)/s ? 1 : undef; +} : undef; + # returns true if there are pending cat-file processes sub cleanup_if_unlinked { my ($self) = @_; - return cleanup($self, 1) if $^O ne 'linux'; + $ck_unlinked_packs or return cleanup($self, 1); # Linux-specific /proc/$PID/maps access # TODO: support this inside git.git - my $ret = 0; - for my $fld (qw(pid pid_c)) { - my $pid = $self->{$fld} // next; - open my $fh, '<', "/proc/$pid/maps" or return cleanup($self, 1); - while (<$fh>) { - # n.b. we do not restart for unlinked multi-pack-index - # since it's not too huge, and the startup cost may - # be higher. - /\.(?:idx|pack) \(deleted\)$/ and - return cleanup($self, 1); - } - ++$ret; + my $nr_live = 0; + for my $obj ($self, ($self->{ck} // ())) { + my $sock = $obj->{sock} // next; + my $pid = $sock->attached_pid // next; + $ck_unlinked_packs->($pid) and return cleanup($self, 1); + ++$nr_live; + } + $nr_live; +} + +sub event_step { + my ($self) = @_; + my $inflight = gcf_inflight($self); + if ($inflight && @$inflight) { + $self->cat_async_step($inflight); + return $self->close unless $self->{sock}; + # don't loop here to keep things fair, but we must requeue + # if there's already-read data in pi_io_rbuf + $self->requeue if $self->{sock}->has_rbuf; } - $ret; } +sub schedule_cleanup { + my ($self) = @_; + PublicInbox::DS::add_uniq_timer($self+0, 30, \&cleanup, $self, 1); +} + +# idempotently registers with DS epoll/kqueue/select/poll +sub watch_async ($) { + my ($self) = @_; + schedule_cleanup($self); + $self->{epwatch} //= do { + $self->SUPER::new($self->{sock}, EPOLLIN); + \undef; + } +} + +sub close { + my ($self) = @_; + my $sock = $self->{sock}; + delete @$self{qw(-bc err_c inflight)}; + delete($self->{epwatch}) ? $self->SUPER::close : delete($self->{sock}); + $sock->close if $sock; # calls gcf_drain via awaitpid +} + +package PublicInbox::GitCheck; # only for git <2.36 +use v5.12; +our @ISA = qw(PublicInbox::Git); +no warnings 'once'; + +# for event_step +*cat_async_step = \&PublicInbox::Git::check_async_step; + 1; __END__ =pod |