mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-09 06:51:56 -05:00
Detect number of cores better on multi-socket systems (#6108)
While the currently used way to detect the number of CPU cores ond Windows is nice and straight-forward, GetSystemInfo() only [gives us access to the number of processors within the current group.](https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-system_info#members) While that is usually fine for systems with a single physical CPU, separate physical sockets are typically separate groups. Switch to using GetLogicalProcessorInformationEx() to handle multi-socket systems better. I've tested this on a physical single-socket x86-64 and a physical dual-socket x86-64 system, and on a virtual single-socket ARM64 system. Physical [multi-socket ARM64 systems seem to exist](https://cloudbase.it/ampere-altra-industry-leading-arm64-server/), but I don't have access to such hardware and the hypervisor I use apparently can't emulate that either.
This commit is contained in:
committed by
Git for Windows Build Agent
commit
14b0fc702f
@@ -9,6 +9,7 @@ SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git svn' <command> [<options>] [<arguments>]
|
||||
(UNSUPPORTED!)
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
||||
13
git-svn.perl
13
git-svn.perl
@@ -305,6 +305,19 @@ sub term_init {
|
||||
: new Term::ReadLine 'git-svn';
|
||||
}
|
||||
|
||||
sub deprecated_warning {
|
||||
my @lines = @_;
|
||||
if (-t STDERR) {
|
||||
@lines = map { "\e[33m$_\e[0m" } @lines;
|
||||
}
|
||||
warn join("\n", @lines), "\n";
|
||||
}
|
||||
|
||||
deprecated_warning(
|
||||
"WARNING: \`git svn\` is no longer supported by the Git for Windows project.",
|
||||
"See https://github.com/git-for-windows/git/issues/5405 for details."
|
||||
);
|
||||
|
||||
my $cmd;
|
||||
for (my $i = 0; $i < @ARGV; $i++) {
|
||||
if (defined $cmd{$ARGV[$i]}) {
|
||||
|
||||
@@ -110,7 +110,8 @@ test_expect_success 'test disallow multi-globs' '
|
||||
svn_cmd commit -m "try to try"
|
||||
) &&
|
||||
test_must_fail git svn fetch three 2> stderr.three &&
|
||||
test_cmp expect.three stderr.three
|
||||
sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean &&
|
||||
test_cmp expect.three stderr.three.clean
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@@ -161,7 +161,8 @@ test_expect_success 'test disallow multiple globs' '
|
||||
svn_cmd commit -m "try to try"
|
||||
) &&
|
||||
test_must_fail git svn fetch three 2> stderr.three &&
|
||||
test_cmp expect.three stderr.three
|
||||
sed "/^WARNING.*no.* supported/{N;d}" <stderr.three >stderr.three.clean &&
|
||||
test_cmp expect.three stderr.three.clean
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@@ -155,7 +155,8 @@ test_expect_success 'test disallow prefixed multi-globs' '
|
||||
svn_cmd commit -m "try to try"
|
||||
) &&
|
||||
test_must_fail git svn fetch four 2>stderr.four &&
|
||||
test_cmp expect.four stderr.four &&
|
||||
sed "/^WARNING.*no.* supported/{N;d}" <stderr.four >stderr.four.clean &&
|
||||
test_cmp expect.four stderr.four.clean &&
|
||||
git config --unset svn-remote.four.branches &&
|
||||
git config --unset svn-remote.four.tags
|
||||
'
|
||||
@@ -223,7 +224,8 @@ test_expect_success 'test disallow multiple asterisks in one word' '
|
||||
svn_cmd commit -m "try to try"
|
||||
) &&
|
||||
test_must_fail git svn fetch six 2>stderr.six &&
|
||||
test_cmp expect.six stderr.six
|
||||
sed "/^WARNING.*no.* supported/{N;d}" <stderr.six >stderr.six.clean &&
|
||||
test_cmp expect.six stderr.six.clean
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@@ -28,11 +28,28 @@ int online_cpus(void)
|
||||
#endif
|
||||
|
||||
#ifdef GIT_WINDOWS_NATIVE
|
||||
SYSTEM_INFO info;
|
||||
GetSystemInfo(&info);
|
||||
|
||||
if ((int)info.dwNumberOfProcessors > 0)
|
||||
return (int)info.dwNumberOfProcessors;
|
||||
DWORD len = 0;
|
||||
if (!GetLogicalProcessorInformationEx(RelationProcessorCore, NULL, &len) && GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
|
||||
uint8_t *buf = malloc(len);
|
||||
if (buf) {
|
||||
if (GetLogicalProcessorInformationEx(RelationProcessorCore, (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) buf, &len)) {
|
||||
DWORD offset = 0;
|
||||
int n_cores = 0;
|
||||
while (offset < len) {
|
||||
PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX info = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) (buf + offset);
|
||||
offset += info->Size;
|
||||
/* The threads within a core always share a single group. We need to count the bits in the mask to get a thread count. */
|
||||
for (KAFFINITY mask = info->Processor.GroupMask[0].Mask; mask; mask >>= 1)
|
||||
n_cores += mask &1;
|
||||
}
|
||||
if (n_cores) {
|
||||
free(buf);
|
||||
return n_cores;
|
||||
}
|
||||
}
|
||||
free(buf);
|
||||
}
|
||||
}
|
||||
#elif defined(hpux) || defined(__hpux) || defined(_hpux)
|
||||
struct pst_dynamic psd;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user