Changeset 9429 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Jun 5, 2008 3:22:37 PM (17 years ago)

Author:

vboxsync

Message:

RTMpDoesCpuExist -> RTMpIsCpuPossible. Changed the RTMpGetCount and RTMpGetSet specification to include all possible cpus.

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• linux/mp-r0drv-linux.c (modified) (4 diffs)
• nt/mp-r0drv-nt.cpp (modified) (8 diffs)
• solaris/mp-r0drv-solaris.c (modified) (3 diffs)
• solaris/vbi/mp-r0drv-solaris.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c

@@ -66 +66 @@
 
 
-RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
-{
-#ifdef CONFIG_SMP
+RTDECL(bool) RTMpIsCpuPossible(RTCPUID idCpu)
+{
+#if defined(CONFIG_SMP)
     if (RT_UNLIKELY(idCpu >= NR_CPUS))
         return false;
-# ifdef cpu_online
-    return cpu_online(idCpu);
-# else /* 2.4: */
-    return cpu_online_map & RT_BIT_64(idCpu);
-# endif
-#else
-    return idCpu == RTMpCpuId();
-#endif
-}
-
-
-RTDECL(bool) RTMpDoesCpuExist(RTCPUID idCpu)
-{
-#ifdef CONFIG_SMP
-    if (RT_UNLIKELY(idCpu >= NR_CPUS))
-        return false;
-# ifdef CONFIG_HOTPLUG_CPU /* introduced & uses cpu_present */
-    return cpu_present(idCpu);
-# elif defined(cpu_possible)
+
+# if defined(cpu_possible)
     return cpu_possible(idCpu);
-# else /* 2.4: */
+# else /* < 2.5.29 */
     return idCpu < (RTCPUID)smp_num_cpus;
 # endif
@@ -108 +91 @@
     do
     {
-        if (RTMpDoesCpuExist(idCpu))
+        if (RTMpIsCpuPossible(idCpu))
             RTCpuSetAdd(pSet, idCpu);
     } while (idCpu-- > 0);
@@ -135 +118 @@
 
 
+RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
+{
+#ifdef CONFIG_SMP
+    if (RT_UNLIKELY(idCpu >= NR_CPUS))
+        return false;
+# ifdef cpu_online
+    return cpu_online(idCpu);
+# else /* 2.4: */
+    return cpu_online_map & RT_BIT_64(idCpu);
+# endif
+#else
+    return idCpu == RTMpCpuId();
+#endif
+}
+
+
 RTDECL(PRTCPUSET) RTMpGetOnlineSet(PRTCPUSET pSet)
 {
@@ -272 +271 @@
     Args.cHits = 0;
 
-    if (!RTMpDoesCpuExist(idCpu))
+    if (!RTMpIsCpuPossible(idCpu))
         return VERR_CPU_NOT_FOUND;
 

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

@@ -95 +95 @@
         return false;
 
+    /** @todo this must be done at init time as it's not safe under all circumstances (braindead OS design). */
     KAFFINITY Mask = KeQueryActiveProcessors();
     return !!(Mask & RT_BIT_64(idCpu));
@@ -100 +101 @@
 
 
-RTDECL(bool) RTMpDoesCpuExist(RTCPUID idCpu)
+RTDECL(bool) RTMpIsCpuPresent(RTCPUID idCpu)
 {
     /* Cannot easily distinguish between online and offline cpus. */
+    /** @todo online/present cpu stuff must be corrected for proper W2K8 support. */
     return RTMpIsCpuOnline(idCpu);
 }
@@ -109 +111 @@
 RTDECL(PRTCPUSET) RTMpGetSet(PRTCPUSET pSet)
 {
+    /** @todo online/present cpu stuff must be corrected for proper W2K8 support. */
     return RTMpGetOnlineSet(pSet);
 }
@@ -115 +118 @@
 RTDECL(RTCPUID) RTMpGetCount(void)
 {
+    /** @todo online/present cpu stuff must be corrected for proper W2K8 support. */
     return RTMpGetOnlineCount();
 }
@@ -167 +171 @@
 #if 0
     /* KeFlushQueuedDpcs must be run at IRQL PASSIVE_LEVEL according to MSDN, but the
-     * driver verifier doesn't complain... 
+     * driver verifier doesn't complain...
      */
     AssertMsg(KeGetCurrentIrql() == PASSIVE_LEVEL, ("%d != %d (PASSIVE_LEVEL)\n", KeGetCurrentIrql(), PASSIVE_LEVEL));
@@ -173 +177 @@
 
     KAFFINITY Mask = KeQueryActiveProcessors();
-
-    if (    enmCpuid == RT_NT_CPUID_SPECIFIC
-        &&  (   idCpu >= 64
-             || !(Mask & RT_BIT_64(idCpu))))
-        return VERR_CPU_NOT_FOUND;  /* can't distinguish between cpu not present or offline */
 
     /* KeFlushQueuedDpcs is not present in Windows 2000; import it dynamically so we can just fail this call. */
@@ -244 +243 @@
         }
         if (enmCpuid != RT_NT_CPUID_OTHERS)
-        {
             pfnWorker(iSelf, pvUser1, pvUser2);
-        }
     }
 
@@ -270 +267 @@
 RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
+    if (RTMpIsCpuOnline(idCpu);
+        return !RTMpIsCpuPossible(idCpu) ? VERR_CPU_NOT_FOUND : VERR_CPU_OFFLINE;
+
     return rtMpCall(pfnWorker, pvUser1, pvUser2, RT_NT_CPUID_SPECIFIC, idCpu);
 }

trunk/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c

@@ -66 +66 @@
 
 
-RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
-{
-    cpu_t *pCpu = idCpu < NCPU ? cpu_get(idCpu) : NULL;
-    return pCpu
-        && cpu_is_online(pCpu);
-}
-
-
-RTDECL(bool) RTMpDoesCpuExist(RTCPUID idCpu)
+RTDECL(bool) RTMpIsCpuPossible(RTCPUID idCpu)
 {
     cpu_t *pCpu = idCpu < NCPU ? cpu_get(idCpu) : NULL;
@@ -89 +81 @@
     do
     {
-        if (RTMpDoesCpuExist(idCpu))
+        if (RTMpIsCpuPossible(idCpu))
             RTCpuSetAdd(pSet, idCpu);
     } while (idCpu-- > 0);
@@ -100 +92 @@
 {
     return ncpus;
+}
+
+
+RTDECL(bool) RTMpIsCpuOnline(RTCPUID idCpu)
+{
+    cpu_t *pCpu = idCpu < NCPU ? cpu_get(idCpu) : NULL;
+    return pCpu
+        && cpu_is_online(pCpu);
 }
 

trunk/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c

@@ -72 +72 @@
 
 
-RTDECL(bool) RTMpDoesCpuExist(RTCPUID idCpu)
+RTDECL(bool) RTMpIsCpuPossible(RTCPUID idCpu)
 {
     return idCpu < vbi_cpu_count();
@@ -86 +86 @@
     do
     {
-        if (RTMpDoesCpuExist(idCpu))
+        if (RTMpIsCpuPossible(idCpu))
             RTCpuSetAdd(pSet, idCpu);
     } while (idCpu-- > 0);