Changeset 16354 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 28, 2009 11:52:28 PM (16 years ago)

Author:

vboxsync

Message:

mp-r0drv-darwin.cpp, the-darwin-kernel.h: ml_get_max_cpus() isn't available on darwin/AMD64, so try sysctlbyname(hw.ncpu) instead.

Location:

trunk/src/VBox/Runtime/r0drv/darwin

Files:

• mp-r0drv-darwin.cpp (modified) (1 diff)
• the-darwin-kernel.h (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp

@@ -44 +44 @@
 
 
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+static int32_t volatile g_cMaxCpus = -1;
+
+
+static int rtMpDarwinInitMaxCpus(void)
+{
+    int32_t cCpus = -1;
+#ifdef RT_ARCH_AMD64
+    size_t  oldLen = sizeof(cCpus);
+    int rc = sysctlbyname("hw.ncpu", &cCpus, &oldLen, NULL, NULL);
+    if (rc)
+    {
+        printf("IPRT: sysctlbyname(hw.ncpu) failed with rc=%d!\n", rc);
+        cCpus = MY_DARWIN_MAX_CPUS;
+    }
+#else
+    cCpus = ml_get_max_cpus();
+#endif
+
+    ASMAtomicWriteS32(&g_cMaxCpus, cCpus);
+    return cCpus;
+}
+
+
 DECLINLINE(int) rtMpDarwinMaxCpus(void)
 {
-    return ml_get_max_cpus();
+    int cCpus = g_cMaxCpus;
+    if (RT_UNLIKELY(cCpus <= 0))
+        return rtMpDarwinInitMaxCpus();
+    return cCpus;
 }
 

trunk/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h

@@ -63 +63 @@
 #endif
 #include <libkern/libkern.h>
+#include <libkern/sysctl.h>
 #include <mach/thread_act.h>
 #include <mach/vm_map.h>