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

Timestamp:

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

Author:

vboxsync

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

31680

Message:

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

File:

• trunk/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp (modified) (8 diffs)

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);
 }