From: Austin Seipp <mad.one@gmail.com>
Date: Wed, 18 Mar 2009 02:31:27 +0000 (+0000)
Subject: FIX getNumberOfProcessors() on MacOS X
X-Git-Tag: 2009-06-25~451
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=97c4b27494addf0231724ca8339e818511256dcf

FIX getNumberOfProcessors() on MacOS X

This checks if darwin_HOST_OS is defined and, if so, we call
sysctlbyname() on the "hw.ncpu" property to get the processor count.
---

diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
index 84b111f..d4d4382 100644
--- a/rts/posix/OSThreads.c
+++ b/rts/posix/OSThreads.c
@@ -23,6 +23,11 @@
 #include <string.h>
 #endif
 
+#if defined(darwin_HOST_OS)
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+
 #if !defined(HAVE_PTHREAD_H)
 #error pthreads.h is required for the threaded RTS on Posix platforms
 #endif
@@ -196,12 +201,16 @@ nat
 getNumberOfProcessors (void)
 {
     static nat nproc = 0;
+    size_t size = sizeof(nat);
 
     if (nproc == 0) {
 #if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
         nproc = sysconf(_SC_NPROCESSORS_ONLN);
 #elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF)
         nproc = sysconf(_SC_NPROCESSORS_CONF);
+#elif defined(darwin_HOST_OS)
+        if(0 != sysctlbyname("hw.ncpu",&nproc,&size,NULL,0))
+            nproc = 1;
 #else
         nproc = 1;
 #endif