eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-12 05:43:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'es/chainlint-ncores-fix' into maint-2.45

Browse Source 
The chainlint script (invoked during "make test") did nothing when
it failed to detect the number of available CPUs.  It now falls
back to 1 CPU to avoid the problem.

* es/chainlint-ncores-fix:
  chainlint.pl: latch CPU count directly reported by /proc/cpuinfo
  chainlint.pl: fix incorrect CPU count on Linux SPARC
  chainlint.pl: make CPU count computation more robust
This commit is contained in:
Junio C Hamano 2024-06-28 15:53:15 -07:00
commit 903b4da27f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
t/chainlint.pl
View File

@ -716,11 +716,25 @@ sub fd_colors {
sub ncores {
# Windows
return $ENV{NUMBER_OF_PROCESSORS} if exists($ENV{NUMBER_OF_PROCESSORS});
if (exists($ENV{NUMBER_OF_PROCESSORS})) {
my $ncpu = $ENV{NUMBER_OF_PROCESSORS};
return $ncpu > 0 ? $ncpu : 1;
}
# Linux / MSYS2 / Cygwin / WSL
do { local @ARGV='/proc/cpuinfo'; return scalar(grep(/^processor[\s\d]*:/, <>)); } if -r '/proc/cpuinfo';
if (open my $fh, '<', '/proc/cpuinfo') {
my $cpuinfo = do { local $/; <$fh> };
close($fh);
if ($cpuinfo =~ /^n?cpus active\s*:\s*(\d+)/m) {
return $1 if $1 > 0;
}
my @matches = ($cpuinfo =~ /^(processor|CPU)[\s\d]*:/mg);
return @matches ? scalar(@matches) : 1;
}
# macOS & BSD
return qx/sysctl -n hw.ncpu/ if $^O =~ /(?:^darwin$|bsd)/;
if ($^O =~ /(?:^darwin$|bsd)/) {
my $ncpu = qx/sysctl -n hw.ncpu/;
return $ncpu > 0 ? $ncpu : 1;
}
return 1;
}