From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 02/18] viewvcs: share File::Temp::Dir with solver
Date: Mon, 29 Aug 2022 09:26:31 +0000 [thread overview]
Message-ID: <20220829092647.1512215-3-e@80x24.org> (raw)
In-Reply-To: <20220829092647.1512215-1-e@80x24.org>
This allows reusing inodes for /$COMMIT_OID/s/ requests.
We'll also replace `log' with `lh' in the field name to
avoid confusion with the `log' perlop.
---
lib/PublicInbox/ViewVCS.pm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 9bf010c2..c5d16478 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -231,12 +231,10 @@ sub show_commit ($$$$) {
'git show --encoding=UTF-8 --pretty=format:%n -M'.
" --stat -p $oid >p && ".
"git patch-id --stable <p" ];
- my $xenv = { GIT_DIR => $git->{git_dir} };
- my $tmp = File::Temp->newdir("show-$oid-XXXX", TMPDIR => 1);
- my $qsp = PublicInbox::Qspawn->new($cmd, $xenv, { -C => "$tmp" });
+ my $e = { GIT_DIR => $git->{git_dir} };
+ my $qsp = PublicInbox::Qspawn->new($cmd, $e, { -C => "$ctx->{-tmp}" });
$qsp->{qsp_err} = \($ctx->{-qsp_err} = '');
$ctx->{-logref} = $logref;
- $ctx->{-tmp} = $tmp;
$ctx->{env}->{'qspawn.wcb'} = delete $ctx->{-wcb};
$ctx->{git} = $git;
$qsp->psgi_qx($ctx->{env}, undef, \&show_commit_start, $ctx);
@@ -260,7 +258,7 @@ sub show_other ($$$$) {
# user_cb for SolverGit, called as: user_cb->($result_or_error, $uarg)
sub solve_result {
my ($res, $ctx) = @_;
- my ($log, $hints, $fn) = delete @$ctx{qw(log hints fn)};
+ my ($log, $hints, $fn) = delete @$ctx{qw(lh hints fn)};
unless (seek($log, 0, 0)) {
warn "seek(log): $!";
@@ -345,15 +343,16 @@ sub show ($$;$) {
defined(my $v = $qp->{$from}) or next;
$hints->{$to} = $v if $v ne '';
}
-
- $ctx->{'log'} = tmpfile("solve.$oid_b") // die "tmpfile: $!";
$ctx->{fn} = $fn;
+ $ctx->{-tmp} = File::Temp->newdir("solver.$oid_b-XXXX", TMPDIR => 1);
+ open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log" or die "open: $!";
my $solver = PublicInbox::SolverGit->new($ctx->{ibx},
\&solve_result, $ctx);
+ $solver->{tmp} = $ctx->{-tmp}; # share tmpdir
# PSGI server will call this immediately and give us a callback (-wcb)
sub {
$ctx->{-wcb} = $_[0]; # HTTP write callback
- $solver->solve($ctx->{env}, $ctx->{log}, $oid_b, $hints);
+ $solver->solve($ctx->{env}, $ctx->{lh}, $oid_b, $hints);
};
}
next prev parent reply other threads:[~2022-08-29 9:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-29 9:26 [PATCH 00/18] WWW: patch, tree, git glossary Eric Wong
2022-08-29 9:26 ` [PATCH 01/18] solver: create tmpdir lazily Eric Wong
2022-08-29 9:26 ` Eric Wong [this message]
2022-08-29 9:26 ` [PATCH 03/18] viewvcs: delay stringification of solver debug log Eric Wong
2022-08-29 9:26 ` [PATCH 04/18] www: allow html_oneshot to take an array arg Eric Wong
2022-08-29 9:26 ` [PATCH 05/18] viewvcs: use array for highlighted blob display Eric Wong
2022-08-29 9:26 ` [PATCH 06/18] viewvcs: add patch download link for single-parent commits Eric Wong
2022-08-29 9:26 ` [PATCH 07/18] viewvcs: author date links to contemporary messages Eric Wong
2022-08-29 9:26 ` [PATCH 08/18] view: speed up /$INBOX/ landing page by 0.5-1.0% Eric Wong
2022-08-29 9:26 ` [PATCH 09/18] treewide: ditch inbox->recent method Eric Wong
2022-08-29 9:26 ` [PATCH 10/18] view: /$INBOX/: show "messages from $old to $new" Eric Wong
2022-08-29 9:26 ` [PATCH 11/18] view: cleanups and reuse for {obuf} preparation Eric Wong
2022-08-29 9:26 ` [PATCH 12/18] www: atom: fix "changed" href to nowhere Eric Wong
2022-08-29 9:26 ` [PATCH 13/18] www: provide text/help/#search anchor Eric Wong
2022-08-29 9:26 ` [PATCH 14/18] solver: early make hints detection more robust Eric Wong
2022-08-29 9:26 ` [PATCH 15/18] viewvcs: add tree view Eric Wong
2022-08-29 9:26 ` [PATCH 16/18] viewvcs: reduce hash assignments for commit info Eric Wong
2022-08-29 9:26 ` [PATCH 17/18] viewvcs: add glossary for commit Eric Wong
2022-08-29 9:57 ` [19/18 PATCH] viewvcs: fixup commit glossary stuff Eric Wong
2022-08-29 9:26 ` [PATCH 18/18] viewvcs: show "blob $OID" rather than "$OID blob" Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220829092647.1512215-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).