From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 1D60E1F601 for ; Mon, 29 Aug 2022 09:26:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1661765208; bh=KqZ1kiBqVEi9hDvmEnZyuxTQeV8aZFemwnr7UiAHWK0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gdtSDZqF+OxAMYNXtUuMDWHpYUIpGPitnnRp3beQc/TSt4UPHtsFgN8oWSmCI0cje JvLAAdPMoEhZtn0wavdQBgXRERY8ZyzPtDrlWphQXLvhI3uOXMe7dM+mx715A5E9uP VYaGM4PioN3XkrrZj85wStQEK0NyvpVqnCrbd+Dw= From: Eric Wong 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 Message-Id: <20220829092647.1512215-3-e@80x24.org> In-Reply-To: <20220829092647.1512215-1-e@80x24.org> References: <20220829092647.1512215-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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 $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); }; }