[Python-checkins] cpython: Issue #17914: Remove OS-X special-case, and use the correct int type.

[charles-francois.natali]

http://hg.python.org/cpython/rev/a85ac58e9eaf
changeset:   83864:a85ac58e9eaf
user:        Charles-Francois Natali <cf.natali at gmail.com>
date:        Mon May 20 17:31:06 2013 +0200
summary:
  Issue #17914: Remove OS-X special-case, and use the correct int type.

files:
  Modules/posixmodule.c |  15 ++++++---------
  1 files changed, 6 insertions(+), 9 deletions(-)


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -10324,12 +10324,12 @@
     defined(__FreeBSD__)   || \
     defined(__NetBSD__)    || \
     defined(__APPLE__)
-static long
+static int
 _bsd_cpu_count(void)
 {
-    long ncpu = 0;
+    int ncpu = 0;
     int mib[2];
-    size_t len = sizeof(int);
+    size_t len = sizeof(ncpu);
 
     mib[0] = CTL_HW;
     mib[1] = HW_NCPU;
@@ -10343,7 +10343,7 @@
 static PyObject *
 posix_cpu_count(PyObject *self)
 {
-    long ncpu = 0;
+    int ncpu = 0;
 #ifdef MS_WINDOWS
     SYSTEM_INFO sysinfo;
     GetSystemInfo(&sysinfo);
@@ -10352,14 +10352,11 @@
     ncpu = mpctl(MPC_GETNUMSPUS, NULL, NULL);
 #elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
     ncpu = sysconf(_SC_NPROCESSORS_ONLN);
-#elif defined(__APPLE__)
-    size_t len = sizeof(int);
-    if (sysctlnametomib("hw.logicalcpu", &ncpu, &len, NULL, 0) != 0)
-        ncpu = _bsd_cpu_count();
 #elif defined(__DragonFly__) || \
       defined(__OpenBSD__)   || \
       defined(__FreeBSD__)   || \
-      defined(__NetBSD__)
+      defined(__NetBSD__)    || \
+      defined(__APPLE__)
     ncpu = _bsd_cpu_count();
 #endif
     if (ncpu >= 1)

-- 
Repository URL: http://hg.python.org/cpython