Add getNumberOfProcessors(), FIX MacOS X build problem (hopefully)

Somebody needs to implement getNumberOfProcessors() for MacOS X,
currently it will return 1.

diff --git a/includes/OSThreads.h b/includes/OSThreads.h
index d4dbc36..73ef4d2 100644 (file)
--- a/includes/OSThreads.h
+++ b/includes/OSThreads.h
@@ -185,6 +185,9 @@ void *getThreadLocalVar (ThreadLocalKey *key);
 void  setThreadLocalVar (ThreadLocalKey *key, void *value);
 void  freeThreadLocalKey (ThreadLocalKey *key);
 
 void  setThreadLocalVar (ThreadLocalKey *key, void *value);
 void  freeThreadLocalKey (ThreadLocalKey *key);
 

+// Processors and affinity
+nat getNumberOfProcessors (void);
+

 #endif // !CMINUSMINUS
 
 #else
 #endif // !CMINUSMINUS
 
 #else

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 2af67e7..b3b95b3 100644 (file)
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -1152,17 +1152,7 @@ error = rtsTrue;
 #if defined(PROFILING)
                    RtsFlags.ParFlags.nNodes = 1;
 #else
 #if defined(PROFILING)
                    RtsFlags.ParFlags.nNodes = 1;
 #else

-#if defined(mingw32_HOST_OS)
-                    {
-                        SYSTEM_INFO si;
-                        GetSystemInfo(&si);
-                        RtsFlags.ParFlags.nNodes = si.dwNumberOfProcessors;
-                    }
-#elif defined(HAVE_SYSCONF)
-                    RtsFlags.ParFlags.nNodes = sysconf(_SC_NPROCESSORS_CONF);
-#else
-                    RtsFlags.ParFlags.nNodes = 1;
-#endif
+                    RtsFlags.ParFlags.nNodes = getNumberOfProcessors();

 #endif
                } else {
                    RtsFlags.ParFlags.nNodes
 #endif
                } else {
                    RtsFlags.ParFlags.nNodes

diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
index 6e01f82..6eb2d2b 100644 (file)
--- a/rts/posix/OSThreads.c
+++ b/rts/posix/OSThreads.c
@@ -179,6 +179,24 @@ forkOS_createThread ( HsStablePtr entry )
     return result;
 }
 
     return result;
 }
 

+nat
+getNumberOfProcessors (void)
+{
+    static nat nproc = 0;
+
+    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);
+#else
+        nproc = 1;
+#endif
+    }
+
+    return nproc;
+}
+

 #else /* !defined(THREADED_RTS) */
 
 int
 #else /* !defined(THREADED_RTS) */
 
 int

diff --git a/rts/win32/OSThreads.c b/rts/win32/OSThreads.c
index ed5c968..929b817 100644 (file)
--- a/rts/win32/OSThreads.c
+++ b/rts/win32/OSThreads.c
@@ -232,6 +232,20 @@ forkOS_createThread ( HsStablePtr entry )
                           (unsigned*)&pId) == 0);
 }
 
                           (unsigned*)&pId) == 0);
 }
 

+nat
+getNumberOfProcessors (void)
+{
+    static nat nproc = 0;
+
+    if (nproc == 0) {
+        SYSTEM_INFO si;
+        GetSystemInfo(&si);
+        nproc = si.dwNumberOfProcessors;
+    }
+
+    return nproc;
+}
+

 #else /* !defined(THREADED_RTS) */
 
 int
 #else /* !defined(THREADED_RTS) */
 
 int