git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-09 06:51:56 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

win32: thread-utils: handle multi-socket systems

Browse Source 
While the currently used way to detect the number of CPU cores on
Windows is nice and straight-forward, GetSystemInfo() only gives us
access to the number of processors within the current group. [1]

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.

[1] https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-system_info#members

This fixes https://github.com/git-for-windows/git/issues/4766

Co-Authored-by: Herman Semenov <GermanAizek@yandex.ru>
Signed-off-by: Matthias Aßhauer <mha1993@live.de>
This commit is contained in:
Matthias Aßhauer
2026-02-21 12:11:02 +01:00
parent 3b2e0093f7
commit 5ce2b45bb3
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
thread-utils.c
View File

@@ -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;