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

[ghc-hetmet.git] / rts / RtsFlags.c

diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index cbc2bb5..b3b95b3 100644 (file)
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -226,6 +226,7 @@ void initRtsFlagsDefaults(void)
     RtsFlags.ParFlags.wakeupMigrate     = rtsFalse;
     RtsFlags.ParFlags.parGcEnabled      = 1;
     RtsFlags.ParFlags.parGcGen          = 1;
+    RtsFlags.ParFlags.parGcLoadBalancing = 1;
 #endif
 
 #ifdef PAR
@@ -1151,17 +1152,7 @@ error = rtsTrue;
 #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
@@ -1211,6 +1202,9 @@ error = rtsTrue;
                             error = rtsTrue;
                         }
                         break;
+                   case 'b':
+                       RtsFlags.ParFlags.parGcLoadBalancing = rtsFalse;
+                       break;
                    case 'm':
                        RtsFlags.ParFlags.migrate = rtsFalse;
                        break;