diff options
Diffstat (limited to 'lib/PublicInbox/ViewVCS.pm')
-rw-r--r-- | lib/PublicInbox/ViewVCS.pm | 363 |
1 files changed, 235 insertions, 128 deletions
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index 02e98768..83a83698 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -17,6 +17,7 @@ use strict; use v5.10.1; use File::Temp 0.19 (); # newdir use PublicInbox::SolverGit; +use PublicInbox::Git; use PublicInbox::GitAsyncCat; use PublicInbox::WwwStream qw(html_oneshot); use PublicInbox::Linkify; @@ -24,9 +25,12 @@ use PublicInbox::Tmpfile; use PublicInbox::ViewDiff qw(flush_diff uri_escape_path); use PublicInbox::View; use PublicInbox::Eml; +use PublicInbox::OnDestroy; use Text::Wrap qw(wrap); -use PublicInbox::Hval qw(ascii_html to_filename prurl); +use PublicInbox::Hval qw(ascii_html to_filename prurl utf8_maybe); use POSIX qw(strftime); +use autodie qw(open seek truncate); +use Fcntl qw(SEEK_SET); my $hl = eval { require PublicInbox::HlMod; PublicInbox::HlMod->new; @@ -46,10 +50,14 @@ my %GIT_MODE = ( '160000' => 'g', # commit (gitlink) ); +# TODO: not fork safe, but we don't fork w/o exec in PublicInbox::WWW +my (@solver_q, $solver_lim); +my $solver_nr = 0; + sub html_page ($$;@) { my ($ctx, $code) = @_[0, 1]; my $wcb = delete $ctx->{-wcb}; - $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/" + $ctx->{-upfx} //= '../../'; # from "/$INBOX/$OID/s/" my $res = html_oneshot($ctx, $code, @_[2..$#_]); $wcb ? $wcb->($res) : $res; } @@ -57,14 +65,15 @@ sub html_page ($$;@) { sub dbg_log ($) { my ($ctx) = @_; my $log = delete $ctx->{lh} // die 'BUG: already captured debug log'; - if (!seek($log, 0, 0)) { + if (!CORE::seek($log, 0, SEEK_SET)) { warn "seek(log): $!"; return '<pre>debug log seek error</pre>'; } - $log = do { local $/; <$log> } // do { - warn "readline(log): $!"; + $log = eval { PublicInbox::IO::read_all $log } // do { + warn "read(log): $@"; return '<pre>debug log read error</pre>'; }; + return '' if $log eq ''; $ctx->{-linkify} //= PublicInbox::Linkify->new; "<hr><pre>debug log:\n\n". $ctx->{-linkify}->to_html($log).'</pre>'; @@ -97,83 +106,129 @@ sub stream_large_blob ($$) { my ($ctx, $res) = @_; $ctx->{-res} = $res; my ($git, $oid, $type, $size, $di) = @$res; - my $cmd = ['git', "--git-dir=$git->{git_dir}", 'cat-file', $type, $oid]; + my $cmd = $git->cmd('cat-file', $type, $oid); my $qsp = PublicInbox::Qspawn->new($cmd); - my $env = $ctx->{env}; - $env->{'qspawn.wcb'} = delete $ctx->{-wcb}; - $qsp->psgi_return($env, undef, \&stream_blob_parse_hdr, $ctx); + $ctx->{env}->{'qspawn.wcb'} = $ctx->{-wcb}; + $qsp->psgi_yield($ctx->{env}, undef, \&stream_blob_parse_hdr, $ctx); } -sub show_other_result ($$) { # tag +sub show_other_result ($$) { # future-proofing my ($bref, $ctx) = @_; if (my $qsp_err = delete $ctx->{-qsp_err}) { return html_page($ctx, 500, dbg_log($ctx) . "git show error:$qsp_err"); } my $l = PublicInbox::Linkify->new; - utf8::decode($$bref); + utf8_maybe($$bref); html_page($ctx, 200, '<pre>', $l->to_html($$bref), '</pre><hr>', dbg_log($ctx)); } sub cmt_title { # git->cat_async callback - my ($bref, $oid, $type, $size, $ctx) = @_; - utf8::decode($$bref); + my ($bref, $oid, $type, $size, $ctx_cb) = @_; + utf8_maybe($$bref); my $title = $$bref =~ /\r?\n\r?\n([^\r\n]+)\r?\n?/ ? $1 : ''; - push(@{$ctx->{-cmt_pt}} , ascii_html($title)) == @{$ctx->{-cmt_P}} and - cmt_finalize($ctx); + # $ctx_cb is [ $ctx, $cmt_fin ] + push @{$ctx_cb->[0]->{-cmt_pt}}, ascii_html($title); } -sub show_commit_start { # ->psgi_qx callback - my ($bref, $ctx) = @_; - if (my $qsp_err = delete $ctx->{-qsp_err}) { - return html_page($ctx, 500, dbg_log($ctx) . - "git show/patch-id error:$qsp_err"); - } - my $patchid = (split(/ /, $$bref))[0]; # ignore commit - $ctx->{-q_value_html} = "patchid:$patchid" if defined $patchid; - open my $fh, '<:utf8', "$ctx->{-tmp}/h" or - die "open $ctx->{-tmp}/h: $!"; - chop(my $buf = do { local $/ = "\0"; <$fh> }); - chomp $buf; - my ($P, $p); - ($P, $p, @{$ctx->{cmt_info}}) = split(/\n/, $buf, 9); - return cmt_finalize($ctx) if !$P; - @{$ctx->{-cmt_P}} = split(/ /, $P); - @{$ctx->{-cmt_p}} = split(/ /, $p); # abbreviated +sub do_cat_async { + my ($arg, $cb, @req) = @_; + # favor git(1) over Gcf2 (libgit2) for SHA-256 support + my $ctx = ref $arg eq 'ARRAY' ? $arg->[0] : $arg; + $ctx->{git}->cat_async($_, $cb, $arg) for @req; if ($ctx->{env}->{'pi-httpd.async'}) { - for (@{$ctx->{-cmt_P}}) { - ibx_async_cat($ctx, $_, \&cmt_title, $ctx); - } - } else { # synchronous - for (@{$ctx->{-cmt_P}}) { - $ctx->{git}->cat_async($_, \&cmt_title, $ctx); - } + $ctx->{git}->watch_async; + } else { # synchronous, generic PSGI $ctx->{git}->cat_async_wait; } } +sub do_check_async { + my ($ctx, $cb, @req) = @_; + if ($ctx->{env}->{'pi-httpd.async'}) { + async_check($ctx, $_, $cb, $ctx) for @req; + } else { # synchronous, generic PSGI + $ctx->{git}->check_async($_, $cb, $ctx) for @req; + $ctx->{git}->check_async_wait; + } +} + +sub cmt_hdr_prep { # psgi_qx cb + my ($fh, $ctx, $cmt_fin) = @_; + return if $ctx->{-qsp_err_h}; # let cmt_fin handle it + seek $fh, 0, SEEK_SET; + my $buf = do { local $/ = "\0"; <$fh> } // die "readline: $!"; + chop($buf) eq "\0" or die 'no NUL in git show -z output'; + utf8_maybe($buf); # non-UTF-8 commits exist + chomp $buf; + (my $P, my $p, @{$ctx->{cmt_info}}) = split(/\n/, $buf, 9); + truncate $fh, 0; + return unless $P; + seek $fh, 0, SEEK_SET; + my $qsp_p = PublicInbox::Qspawn->new($ctx->{git}->cmd(qw(show + --encoding=UTF-8 --pretty=format:%n -M --stat -p), $ctx->{oid}), + undef, { 1 => $fh }); + $qsp_p->{qsp_err} = \($ctx->{-qsp_err_p} = ''); + $qsp_p->psgi_qx($ctx->{env}, undef, \&cmt_patch_prep, $ctx, $cmt_fin); + @{$ctx->{-cmt_P}} = split / /, $P; + @{$ctx->{-cmt_p}} = split / /, $p; # abbreviated + do_cat_async([$ctx, $cmt_fin], \&cmt_title, @{$ctx->{-cmt_P}}); +} + +sub read_patchid { # psgi_qx cb + my ($bref, $ctx, $cmt_fin) = @_; + my ($patchid) = split(/ /, $$bref); # ignore commit + $ctx->{-q_value_html} = "patchid:$patchid" if defined $patchid; +} + +sub cmt_patch_prep { # psgi_qx cb + my ($fh, $ctx, $cmt_fin) = @_; + return if $ctx->{-qsp_err_p}; # let cmt_fin handle error + return if -s $fh > $MAX_SIZE; # too big to show, too big to patch-id + seek $fh, 0, SEEK_SET; + my $qsp = PublicInbox::Qspawn->new( + $ctx->{git}->cmd(qw(patch-id --stable)), + undef, { 0 => $fh }); + $qsp->{qsp_err} = \$ctx->{-qsp_err_p}; + $qsp->psgi_qx($ctx->{env}, undef, \&read_patchid, $ctx, $cmt_fin); +} + sub ibx_url_for { my ($ctx) = @_; - $ctx->{ibx} and return; # just fall back to $upfx - $ctx->{git} or return; # /$CODEREPO/$OID/s/ to (eidx|ibx) + $ctx->{ibx} and return; # fall back to $upfx + $ctx->{git} or die 'BUG: no {git}'; if (my $ALL = $ctx->{www}->{pi_cfg}->ALL) { - $ALL->base_url // $ALL->base_url($ctx->{env}); - } elsif (my $ibxs = $ctx->{git}->{-ibxs}) { - for my $ibx (@$ibxs) { - if ($ibx->isrch) { - return defined($ibx->{url}) ? - prurl($ctx->{env}, $ibx->{url}) : - "../../../$ibx->{name}/"; - } + if (defined(my $u = $ALL->base_url($ctx->{env}))) { + return wantarray ? ($u) : $u; } - } else { - undef; } + my @ret; + if (my $ibx_names = $ctx->{git}->{ibx_names}) { + my $by_name = $ctx->{www}->{pi_cfg}->{-by_name}; + for my $name (@$ibx_names) { + my $ibx = $by_name->{$name} // do { + warn "inbox `$name' no longer exists\n"; + next; + }; + $ibx->isrch // next; + my $u = defined($ibx->{url}) ? + prurl($ctx->{env}, $ibx->{url}) : $name; + $u .= '/' if substr($u, -1) ne '/'; + push @ret, $u; + } + } + wantarray ? (@ret) : $ret[0]; } -sub cmt_finalize { +sub cmt_fin { # OnDestroy cb my ($ctx) = @_; + my ($eh, $ep) = delete @$ctx{qw(-qsp_err_h -qsp_err_p)}; + if ($eh || $ep) { + my $e = join(' - ', grep defined, $eh, $ep); + return html_page($ctx, 500, dbg_log($ctx) . + "git show/patch-id error:$e"); + } $ctx->{-linkify} //= PublicInbox::Linkify->new; my $upfx = $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/" my ($H, $T, $s, $f, $au, $co, $bdy) = @{delete $ctx->{cmt_info}}; @@ -187,13 +242,15 @@ sub cmt_finalize { $au =~ s/>/>$x/; } $_ = ascii_html($_) for ($au, $co); + my $ibx_url = ibx_url_for($ctx) // $upfx; $au =~ s!(> +)([0-9]{4,}-\S+ \S+)! my ($gt, $t) = ($1, $2); $t =~ tr/ :-//d; qq($gt<a -href="$upfx?t=$t" +href="$ibx_url?t=$t" title="list contemporary emails">$2</a>) !e; + $ctx->{-title_html} = $s = $ctx->{-linkify}->to_html($s); my ($P, $p, $pt) = delete @$ctx{qw(-cmt_P -cmt_p -cmt_pt)}; $_ = qq(<a href="$upfx$_/s/">).shift(@$p).'</a> '.shift(@$pt) for @$P; @@ -212,20 +269,21 @@ href="$f.patch">patch</a>)\n <a href=#parent>parent</a> $P->[0]}; my $zfh = $ctx->zfh; print $zfh <<EOM; <pre> <a href=#commit>commit</a> $H$x - <a href=#tree>tree</a> <a href="$upfx$T/s/">$T</a> + <a href=#tree>tree</a> <a href="$upfx$T/s/?b=">$T</a> author $au committer $co <b>$s</b> EOM print $zfh "\n", $ctx->{-linkify}->to_html($bdy) if length($bdy); - $bdy = ''; - open my $fh, '<:utf8', "$ctx->{-tmp}/p" or - die "open $ctx->{-tmp}/p: $!"; + undef $bdy; # free memory + my $fh = delete $ctx->{patch_fh}; if (-s $fh > $MAX_SIZE) { - print $zfh "---\n patch is too large to show\n"; + print $zfh '</pre><hr><pre>patch is too large to show</pre>'; } else { # prepare flush_diff: - read($fh, $x, -s _); + seek $fh, 0, SEEK_SET; + PublicInbox::IO::read_all $fh, -s _, \$x; + utf8_maybe($x); $ctx->{-apfx} = $ctx->{-spfx} = $upfx; $x =~ s/\r?\n/\n/gs; $ctx->{-anchors} = {} if $x =~ /^diff --git /sm; @@ -250,14 +308,16 @@ EOM my $ibx_url = ibx_url_for($ctx); my $alt; if (defined $ibx_url) { + $alt = " `$ibx_url'"; + $ibx_url =~ m!://! or + substr($ibx_url, 0, 0, '../../../'); $ibx_url = ascii_html($ibx_url); - $alt = ' '.$ibx_url; } else { $ibx_url = $upfx; $alt = ''; } print $zfh <<EOM; -<hr><form action="$ibx_url" +</pre><hr><form action="$ibx_url" id=related><pre>find related emails, including ancestors/descendants/conflicts <textarea name=q cols=${\PublicInbox::View::COLS} rows=$rows>$q</textarea> <input type=submit value="search$alt" @@ -282,7 +342,7 @@ possible to have multiple root commits when merging independent histories. Every commit references one top-level <dfn id=tree>tree</dfn> object.</pre> EOM - delete($ctx->{env}->{'qspawn.wcb'})->($ctx->html_done($x)); + delete($ctx->{-wcb})->($ctx->html_done($x)); } sub stream_patch_parse_hdr { # {parse_hdr} for Qspawn @@ -308,13 +368,12 @@ sub stream_patch_parse_hdr { # {parse_hdr} for Qspawn sub show_patch ($$) { my ($ctx, $res) = @_; my ($git, $oid) = @$res; - my @cmd = ('git', "--git-dir=$git->{git_dir}", - qw(format-patch -1 --stdout -C), + my $cmd = $git->cmd(qw(format-patch -1 --stdout -C), "--signature=git format-patch -1 --stdout -C $oid", $oid); - my $qsp = PublicInbox::Qspawn->new(\@cmd); - $ctx->{env}->{'qspawn.wcb'} = delete $ctx->{-wcb}; + my $qsp = PublicInbox::Qspawn->new($cmd); + $ctx->{env}->{'qspawn.wcb'} = $ctx->{-wcb}; $ctx->{patch_oid} = $oid; - $qsp->psgi_return($ctx->{env}, undef, \&stream_patch_parse_hdr, $ctx); + $qsp->psgi_yield($ctx->{env}, undef, \&stream_patch_parse_hdr, $ctx); } sub show_commit ($$) { @@ -324,18 +383,15 @@ sub show_commit ($$) { # patch-id needs two passes, and we use the initial show to ensure # a patch embedded inside the commit message body doesn't get fed # to patch-id: - my $cmd = [ '/bin/sh', '-c', - "git show --encoding=UTF-8 '$SHOW_FMT'". - " -z --no-notes --no-patch $oid >h && ". - 'git show --encoding=UTF-8 --pretty=format:%n -M'. - " --stat -p $oid >p && ". - "git patch-id --stable <p" ]; - my $e = { GIT_DIR => $git->{git_dir} }; - my $qsp = PublicInbox::Qspawn->new($cmd, $e, { -C => "$ctx->{-tmp}" }); - $qsp->{qsp_err} = \($ctx->{-qsp_err} = ''); - $ctx->{env}->{'qspawn.wcb'} = delete $ctx->{-wcb}; + open $ctx->{patch_fh}, '+>', "$ctx->{-tmp}/show"; + my $qsp_h = PublicInbox::Qspawn->new($git->cmd('show', $SHOW_FMT, + qw(--encoding=UTF-8 -z --no-notes --no-patch), $oid), + undef, { 1 => $ctx->{patch_fh} }); + $qsp_h->{qsp_err} = \($ctx->{-qsp_err_h} = ''); + my $cmt_fin = on_destroy \&cmt_fin, $ctx; $ctx->{git} = $git; - $qsp->psgi_qx($ctx->{env}, undef, \&show_commit_start, $ctx); + $ctx->{oid} = $oid; + $qsp_h->psgi_qx($ctx->{env}, undef, \&cmt_hdr_prep, $ctx, $cmt_fin); } sub show_other ($$) { # just in case... @@ -343,8 +399,8 @@ sub show_other ($$) { # just in case... my ($git, $oid, $type, $size) = @$res; $size > $MAX_SIZE and return html_page($ctx, 200, ascii_html($type)." $oid is too big to show\n". dbg_log($ctx)); - my $cmd = ['git', "--git-dir=$git->{git_dir}", - qw(show --encoding=UTF-8 --no-color --no-abbrev), $oid ]; + my $cmd = $git->cmd(qw(show --encoding=UTF-8 + --no-color --no-abbrev), $oid); my $qsp = PublicInbox::Qspawn->new($cmd); $qsp->{qsp_err} = \($ctx->{-qsp_err} = ''); $qsp->psgi_qx($ctx->{env}, undef, \&show_other_result, $ctx); @@ -359,48 +415,64 @@ sub show_tree_result ($$) { my @ent = split(/\0/, $$bref); my $qp = delete $ctx->{qp}; my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new; - my $pfx = $qp->{b}; + my $pfx = $ctx->{-path} // $qp->{b}; # {-path} is from RepoTree $$bref = "<pre><a href=#tree>tree</a> $ctx->{tree_oid}"; + # $REPO/tree/$path already sets {-upfx} + my $upfx = $ctx->{-upfx} //= '../../'; if (defined $pfx) { - my $x = ascii_html($pfx); - $pfx .= '/'; - $$bref .= qq( <a href=#path>path</a>: $x</a>\n); + $pfx =~ s!/+\z!!s; + if (my $t = $ctx->{-obj}) { + my $t = ascii_html($t); + $$bref .= <<EOM +\n\$ git ls-tree -l $t # shows similar output on the CLI +EOM + } elsif ($pfx eq '') { + $$bref .= " (root)\n"; + } else { + my $x = ascii_html($pfx); + $pfx .= '/'; + $$bref .= qq( <a href=#path>path</a>: $x</a>\n); + } } else { $pfx = ''; $$bref .= qq[ (<a href=#path>path</a> unknown)\n]; } - my ($x, $m, $t, $oid, $sz, $f, $n); + my ($x, $m, $t, $oid, $sz, $f, $n, $gitlink); $$bref .= "\n size name"; for (@ent) { ($x, $f) = split(/\t/, $_, 2); undef $_; ($m, $t, $oid, $sz) = split(/ +/, $x, 4); $m = $GIT_MODE{$m} // '?'; - utf8::decode($f); + utf8_maybe($f); $n = ascii_html($f); if ($m eq 'g') { # gitlink submodule commit $$bref .= "\ng\t\t$n @ <a\nhref=#g>commit</a>$oid"; + $gitlink = 1; next; } my $q = 'b='.ascii_html(uri_escape_path($pfx.$f)); if ($m eq 'd') { $n .= '/' } elsif ($m eq 'x') { $n = "<b>$n</b>" } elsif ($m eq 'l') { $n = "<i>$n</i>" } - $$bref .= qq(\n$m\t$sz\t<a\nhref="../../$oid/s/?$q">$n</a>); + $$bref .= qq(\n$m\t$sz\t<a\nhref="$upfx$oid/s/?$q">$n</a>); } $$bref .= dbg_log($ctx); $$bref .= <<EOM; -<pre>glossary +<hr><pre>glossary -------- <dfn id=tree>Tree</dfn> objects belong to commits or other tree objects. Trees may -reference blobs, sub-trees, or commits of submodules. +reference blobs, sub-trees, or (rarely) commits of submodules. <dfn id=path>Path</dfn> names are stored in tree objects, but trees do not know their own path name. A tree's path name comes from their parent tree, or it is the root tree referenced by a commit object. Thus, this web UI relies on the `b=' URI parameter as a hint to display the path name. +EOM + + $$bref .= <<EOM if $gitlink; <dfn title="submodule commit" id=g>Commit</dfn> objects may be stored in trees to reference submodules.</pre> @@ -409,13 +481,12 @@ EOM html_page($ctx, 200, $$bref); } -sub show_tree ($$) { +sub show_tree ($$) { # also used by RepoTree my ($ctx, $res) = @_; my ($git, $oid, undef, $size) = @$res; $size > $MAX_SIZE and return html_page($ctx, 200, "tree $oid is too big to show\n". dbg_log($ctx)); - my $cmd = [ 'git', "--git-dir=$git->{git_dir}", - qw(ls-tree -z -l --no-abbrev), $oid ]; + my $cmd = $git->cmd(qw(ls-tree -z -l --no-abbrev), $oid); my $qsp = PublicInbox::Qspawn->new($cmd); $ctx->{tree_oid} = $oid; $qsp->{qsp_err} = \($ctx->{-qsp_err} = ''); @@ -434,7 +505,7 @@ sub tz_adj ($) { sub show_tag_result { # git->cat_async callback my ($bref, $oid, $type, $size, $ctx) = @_; - utf8::decode($$bref); + utf8_maybe($$bref); my $l = PublicInbox::Linkify->new; $$bref = $l->to_html($$bref); $$bref =~ s!^object ([a-f0-9]+)!object <a @@ -450,44 +521,55 @@ sub show_tag ($$) { my ($ctx, $res) = @_; my ($git, $oid) = @$res; $ctx->{git} = $git; - if ($ctx->{env}->{'pi-httpd.async'}) { - ibx_async_cat($ctx, $oid, \&show_tag_result, $ctx); - } else { # synchronous (generic PSGI) - $git->cat_async($oid, \&show_tag_result, $ctx); - $git->cat_async_wait; - } + do_cat_async($ctx, \&show_tag_result, $oid); } # user_cb for SolverGit, called as: user_cb->($result_or_error, $uarg) sub solve_result { my ($res, $ctx) = @_; my $hints = delete $ctx->{hints}; - $res or return html_page($ctx, 404, dbg_log($ctx)); - ref($res) eq 'ARRAY' or return html_page($ctx, 500, dbg_log($ctx)); + $res or return html_page($ctx, 404, 'Not found', dbg_log($ctx)); + ref($res) eq 'ARRAY' or + return html_page($ctx, 500, 'Internal error', dbg_log($ctx)); my ($git, $oid, $type, $size, $di) = @$res; return show_commit($ctx, $res) if $type eq 'commit'; return show_tree($ctx, $res) if $type eq 'tree'; return show_tag($ctx, $res) if $type eq 'tag'; return show_other($ctx, $res) if $type ne 'blob'; - my $path = to_filename($di->{path_b} // $hints->{path_b} // 'blob'); - my $raw_link = "(<a\nhref=$path>raw</a>)"; + my $fn = $di->{path_b} // $hints->{path_b}; + my $paths = $ctx->{-paths} //= do { + my $path = to_filename($fn // 'blob') // 'blob'; + my $raw_more = qq[(<a\nhref="$path">raw</a>)]; + my @def; + + # XXX not sure if this is the correct wording + if (defined($fn)) { + $raw_more .= qq( +name: ${\ascii_html($fn)} \t # note: path name is non-authoritative<a +href="#pathdef" id=top>(*)</a>); + $def[0] = "<hr><pre\nid=pathdef>" . +'(*) Git path names are given by the tree(s) the blob belongs to. + Blobs themselves have no identifier aside from the hash of its contents.'. +qq(<a\nhref="#top">^</a></pre>); + } + [ $path, $raw_more, @def ]; + }; + $ctx->{-q_value_html} //= do { + my $s = defined($fn) ? 'dfn:'.ascii_html($fn).' ' : ''; + $s.'dfpost:'.substr($oid, 0, 7); + }; + if ($size > $MAX_SIZE) { return stream_large_blob($ctx, $res) if defined $ctx->{fn}; return html_page($ctx, 200, <<EOM . dbg_log($ctx)); <pre><b>Too big to show, download available</b> -blob $oid $size bytes $raw_link</pre> +blob $oid $size bytes $paths->[1]</pre> EOM } - @{$ctx->{-paths}} = ($path, $raw_link); bless $ctx, 'PublicInbox::WwwStream'; # for DESTROY $ctx->{git} = $git; - if ($ctx->{env}->{'pi-httpd.async'}) { - ibx_async_cat($ctx, $oid, \&show_blob, $ctx); - } else { # synchronous - $git->cat_async($oid, \&show_blob, $ctx); - $git->cat_async_wait; - } + do_cat_async($ctx, \&show_blob, $oid); } sub show_blob { # git->cat_async callback @@ -505,13 +587,13 @@ sub show_blob { # git->cat_async callback return delete($ctx->{-wcb})->([200, $h, [ $$blob ]]); } - my ($path, $raw_link) = @{delete $ctx->{-paths}}; + my ($path, $raw_more, @def) = @{delete $ctx->{-paths}}; $bin and return html_page($ctx, 200, "<pre>blob $oid $size bytes (binary)" . - " $raw_link</pre>".dbg_log($ctx)); + " $raw_more</pre>".dbg_log($ctx)); # TODO: detect + convert to ensure validity - utf8::decode($$blob); + utf8_maybe($$blob); my $nl = ($$blob =~ s/\r?\n/\n/sg); my $pad = length($nl); @@ -524,7 +606,7 @@ sub show_blob { # git->cat_async callback } # using some of the same CSS class names and ids as cgit - my $x = "<pre>blob $oid $size bytes $raw_link</pre>" . + my $x = "<pre>blob $oid $size bytes $raw_more</pre>" . "<hr /><table\nclass=blob>". "<tr><td\nclass=linenumbers><pre>"; # scratchpad in this loop is faster here than `printf $zfh': @@ -532,30 +614,55 @@ sub show_blob { # git->cat_async callback $x .= '</pre></td><td><pre> </pre></td>'. # pad for non-CSS users "<td\nclass=lines><pre\nstyle='white-space:pre'><code>"; html_page($ctx, 200, $x, $ctx->{-linkify}->linkify_2($$blob), - '</code></pre></td></tr></table>'.dbg_log($ctx)); + '</code></pre></td></tr></table>'.dbg_log($ctx), @def); } -# GET /$INBOX/$GIT_OBJECT_ID/s/ -# GET /$INBOX/$GIT_OBJECT_ID/s/$FILENAME -sub show ($$;$) { - my ($ctx, $oid_b, $fn) = @_; - my $qp = $ctx->{qp}; - my $hints = $ctx->{hints} = {}; +sub start_solver ($) { + my ($ctx) = @_; while (my ($from, $to) = each %QP_MAP) { - defined(my $v = $qp->{$from}) or next; - $hints->{$to} = $v if $v ne ''; + my $v = $ctx->{qp}->{$from} // next; + $ctx->{hints}->{$to} = $v if $v ne ''; } - $ctx->{fn} = $fn; - $ctx->{-tmp} = File::Temp->newdir("solver.$oid_b-XXXX", TMPDIR => 1); - open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log" or die "open: $!"; + $ctx->{-next_solver} = on_destroy \&next_solver; + ++$solver_nr; + $ctx->{-tmp} = File::Temp->newdir("solver.$ctx->{oid_b}-XXXX", + TMPDIR => 1); + $ctx->{lh} or open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log"; my $solver = PublicInbox::SolverGit->new($ctx->{ibx}, \&solve_result, $ctx); + $solver->{limiter} = $solver_lim; $solver->{gits} //= [ $ctx->{git} ]; $solver->{tmp} = $ctx->{-tmp}; # share tmpdir # PSGI server will call this immediately and give us a callback (-wcb) + $solver->solve(@$ctx{qw(env lh oid_b hints)}); +} + +# run the next solver job when done and DESTROY-ed +sub next_solver { + --$solver_nr; + # XXX FIXME: client may've disconnected if it waited a long while + start_solver(shift(@solver_q) // return); +} + +sub may_start_solver ($) { + my ($ctx) = @_; + $solver_lim //= $ctx->{www}->{pi_cfg}->limiter('codeblob'); + if ($solver_nr >= $solver_lim->{max}) { + @solver_q > 128 ? html_page($ctx, 503, 'too busy') + : push(@solver_q, $ctx); + } else { + start_solver($ctx); + } +} + +# GET /$INBOX/$GIT_OBJECT_ID/s/ +# GET /$INBOX/$GIT_OBJECT_ID/s/$FILENAME +sub show ($$;$) { + my ($ctx, $oid_b, $fn) = @_; + @$ctx{qw(oid_b fn)} = ($oid_b, $fn); sub { $ctx->{-wcb} = $_[0]; # HTTP write callback - $solver->solve($ctx->{env}, $ctx->{lh}, $oid_b, $hints); + may_start_solver $ctx; }; } |