mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-30581: Windows: os.cpu_count() returns wrong number of processors (#2934)

Browse source 
* Fixes #30581 by adding a path to use newer GetMaximumProcessorCount API on Windows calls to os.cpu_count()

* Add NEWS.d entry for bpo-30581, os.cpu_count on Windows.

* Tweak NEWS entry
This commit is contained in:
Christopher Wilcox 2017-08-30 05:01:08 -04:00 • committed by Antoine Pitrou
parent 390eadd6d0
commit c67bae0478
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS.d/next/Windows/2017-08-04-10-05-19.bpo-30581.OQhR7l.rst Normal file
View file

@ -0,0 +1,2 @@
os.cpu_count() now returns the correct number of processors on Windows
when the number of logical processors is greater than 64.

19
Modules/posixmodule.c
View file

@ -11174,9 +11174,22 @@ os_cpu_count_impl(PyObject *module)
{ {
int ncpu = 0; int ncpu = 0;
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
SYSTEM_INFO sysinfo; /* Vista is supported and the GetMaximumProcessorCount API is Win7+
GetSystemInfo(&sysinfo); Need to fallback to Vista behavior if this call isn't present */
ncpu = sysinfo.dwNumberOfProcessors; HINSTANCE hKernel32;
hKernel32 = GetModuleHandleW(L"KERNEL32");
static DWORD(CALLBACK *_GetMaximumProcessorCount)(WORD) = NULL;
*(FARPROC*)&_GetMaximumProcessorCount = GetProcAddress(hKernel32,
"GetMaximumProcessorCount");
if (_GetMaximumProcessorCount != NULL) {
ncpu = _GetMaximumProcessorCount(ALL_PROCESSOR_GROUPS);
}
else {
SYSTEM_INFO sysinfo;
GetSystemInfo(&sysinfo);
ncpu = sysinfo.dwNumberOfProcessors;
}
#elif defined(__hpux) #elif defined(__hpux)
ncpu = mpctl(MPC_GETNUMSPUS, NULL, NULL); ncpu = mpctl(MPC_GETNUMSPUS, NULL, NULL);
#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) #elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)