Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-09-20 01:11:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[common] cpuinfo: handle more than 64 threads on Windows

Browse Source 
The old code will not correctly report the number of threads on CPUs with
more than one processor group, i.e. when there are more than 64 logical
processors (threads).
This commit is contained in:
Quantum 2021-09-01 06:01:28 -04:00 committed by Geoffrey McRae
parent 286da11172
commit ab033d84b1
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/src/platform/windows/cpuinfo.c
View File

@ -24,16 +24,6 @@
#include <windows.h> #include <windows.h>
static void getProcessorCount(int * procs)
{
if (!procs)
return;
SYSTEM_INFO si;
GetSystemInfo(&si);
*procs = si.dwNumberOfProcessors;
}
static bool getCPUModel(char * model, size_t modelSize) static bool getCPUModel(char * model, size_t modelSize)
{ {
if (!model) if (!model)
@ -58,9 +48,9 @@ static bool getCPUModel(char * model, size_t modelSize)
return true; return true;
} }
static bool getCoreCount(int * cores) static bool getCoreCount(int * cores, int * procs)
{ {
if (!cores) if (!cores && !procs)
return true; return true;
DWORD cb = 0; DWORD cb = 0;
@ -79,14 +69,26 @@ static bool getCoreCount(int * cores)
return false; return false;
} }
*cores = 0; if (cores)
*cores = 0;
if (procs)
*procs = 0;
DWORD offset = 0; DWORD offset = 0;
while (offset < cb) while (offset < cb)
{ {
PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX lpi = PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX lpi =
(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) (buffer + offset); (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX) (buffer + offset);
if (lpi->Relationship == RelationProcessorCore) if (lpi->Relationship == RelationProcessorCore)
++*cores; {
if (cores)
++*cores;
if (procs)
for (int i = 0; i < lpi->Processor.GroupCount; ++i)
*procs += __builtin_popcount(lpi->Processor.GroupMask[i].Mask);
}
offset += lpi->Size; offset += lpi->Size;
} }
@ -95,6 +97,5 @@ static bool getCoreCount(int * cores)
bool lgCPUInfo(char * model, size_t modelSize, int * procs, int * cores) bool lgCPUInfo(char * model, size_t modelSize, int * procs, int * cores)
{ {
getProcessorCount(procs); return getCPUModel(model, modelSize) && getCoreCount(cores, procs);
return getCPUModel(model, modelSize) && getCoreCount(cores);
} }