Changeset 48441 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 11, 2013 5:35:55 PM (11 years ago)

Author:

vboxsync

Message:

VMM/VMMAll: Fix nasty wake up with SMP VMs and thread-context hooks.

File:

• trunk/src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

@@ -200 +200 @@
      * and then by native thread id (page fusion case).
      */
-    /* RTMpCpuId had better be cheap. */
-    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
-    RTCPUID idHostCpu = RTMpCpuId();
-
-    /** @todo optimize for large number of VCPUs when that becomes more common. */
-    for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
-    {
-        PVMCPU pVCpu = &pVM->aCpus[idCpu];
-
-        if (pVCpu->idHostCpu == idHostCpu)
-            return pVCpu->idCpu;
+    if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
+    {
+        /** @todo r=ramshankar: This doesn't buy us anything in terms of performance
+         *        leaving it here for hysterical raisins and as a reference if we
+         *        implemented a hashing approach in the future. */
+        RTCPUID idHostCpu = RTMpCpuId();
+
+        /** @todo optimize for large number of VCPUs when that becomes more common. */
+        for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
+        {
+            PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+            if (pVCpu->idHostCpu == idHostCpu)
+                return pVCpu->idCpu;
+        }
     }
 
@@ -263 +267 @@
          *        leaving it here for hysterical raisins and as a reference if we
          *        implemented a hashing approach in the future. */
-
-        /* RTMpCpuId had better be cheap. */
         RTCPUID idHostCpu = RTMpCpuId();