Changeset 10421 in vbox

Timestamp:

Jul 9, 2008 1:52:22 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

33081

Message:

_SC_NPROCESSORS_CONF doesn't work.

File:

• trunk/src/VBox/Runtime/r3/linux/mp-linux.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/linux/mp-linux.cpp

@@ -219 +219 @@
  * @returns Max cpus.
  */
-DECLINLINE(RTCPUID) rtMpLinuxMaxCpus(void)
-{
+static RTCPUID rtMpLinuxMaxCpus(void)
+{
+#if 0 /* this doesn't do the right thing :-/ */
     int cMax = sysconf(_SC_NPROCESSORS_CONF);
     Assert(cMax >= 1);
     return cMax;
+#else
+    static uint32_t s_cMax = 0;
+    if (!s_cMax)
+    {
+        int cMax = 1;
+        for (unsigned iCpu = 0; iCpu < RTCPUSET_MAX_CPUS; iCpu++)
+            if (rtLinuxSysFsExists("devices/system/cpu/cpu%d", iCpu))
+                cMax = iCpu + 1;
+        ASMAtomicUoWriteU32((uint32_t volatile *)&s_cMax, cMax);
+        return cMax;
+    }
+    return s_cMax;
+#endif
 }