From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 6/8] git: avoid extra stat(2) for git version
Date: Fri, 27 Oct 2023 01:14:41 +0000 [thread overview]
Message-ID: <20231027011443.3709841-6-e@80x24.org> (raw)
In-Reply-To: <20231027011443.3709841-1-e@80x24.org>
No sane installer will update executable files in place due to
ETXTBSY, SIGBUS, or similar errors on execve. So save ourselves
a stat(2) call by relying on the special `CORE::stat(_)' case to
reuse the cached result from the `-x FILE' filetest in which().
---
lib/PublicInbox/Git.pm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index b5adc1f4..a1d52118 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -17,7 +17,6 @@ use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
use Errno qw(EINTR EAGAIN);
use File::Glob qw(bsd_glob GLOB_NOSORT);
use File::Spec ();
-use Time::HiRes qw(stat);
use PublicInbox::Spawn qw(spawn popen_rd run_qx which);
use PublicInbox::ProcessIONBF;
use PublicInbox::Tmpfile;
@@ -53,13 +52,13 @@ my %GIT_ESC = (
);
my %ESC_GIT = map { $GIT_ESC{$_} => $_ } keys %GIT_ESC;
-my $EXE_ST = ''; # pack('dd', st_ctime, st_size);
+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($GIT_EXE) or die "stat($GIT_EXE): $!";
- my $st = pack('dd', $st[10], $st[7]);
+ 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 $?;
@@ -117,6 +116,7 @@ sub git_path ($$) {
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
next prev parent reply other threads:[~2023-10-27 1:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-27 1:14 [PATCH 1/8] lei: don't exit lei-daemon on ovv_begin failure Eric Wong
2023-10-27 1:14 ` [PATCH 2/8] spawn: croak directly in C pi_fork_exec Eric Wong
2023-10-27 1:14 ` [PATCH 3/8] spawnpp: use autodie for syscall failures Eric Wong
2023-10-27 1:14 ` [PATCH 4/8] spawn: avoid alloca in C pi_fork_exec Eric Wong
2023-10-27 1:14 ` [PATCH 5/8] git: use run_qx to read `git --version' Eric Wong
2023-10-27 1:14 ` Eric Wong [this message]
2023-10-27 1:14 ` [PATCH 7/8] import: use run_qx Eric Wong
2023-10-27 1:14 ` [PATCH 8/8] treewide: use ->close method rather than CORE::close 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231027011443.3709841-6-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.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).