diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2024-05-20 15:01:31 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-22 11:58:56 -0700 |
| commit | 2e7e9205beb5a745f91d0d0ce772c7b447c3aba8 (patch) | |
| tree | ea7bc35ab4c2fddb216a251342cf04d28fc94767 | |
| parent | 45db5ed3b2f9f1c4768633f3d691bbe1305cf9ca (diff) | |
| download | git-2e7e9205beb5a745f91d0d0ce772c7b447c3aba8.tar.gz | |
chainlint.pl: latch CPU count directly reported by /proc/cpuinfo
On Linux, ncores() computes the number of CPUs by counting the
"processor" or "CPU" lines emitted by /proc/cpuinfo. However, on some
platforms, /proc/cpuinfo does not enumerate the CPUs at all, but
instead merely mentions the total number of CPUs. In such cases, pluck
the CPU count directly from the /proc/cpuinfo line which reports the
number of active CPUs. (In particular, check for "cpus active: NN" and
"ncpus active: NN" since both variants have been seen in the
wild[1,2].)
[1]: https://lore.kernel.org/git/503a99f3511559722a3eeef15d31027dfe617fa1.camel@physik.fu-berlin.de/
[2]: https://lore.kernel.org/git/7acbd5c6c68bd7ba020e2d1cc457a8954fd6edf4.camel@physik.fu-berlin.de/
Reported-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/chainlint.pl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/chainlint.pl b/t/chainlint.pl index ea154a206a..f00a3b937b 100755 --- a/t/chainlint.pl +++ b/t/chainlint.pl @@ -715,6 +715,9 @@ sub ncores { 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; } |