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

Timestamp:

Aug 4, 2010 3:34:27 PM (15 years ago)

Author:

vboxsync

Message:

Temporarily backed out 64410

File:

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

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

@@ -61 +61 @@
         return 0;
 
+    /* Search first by host cpu id (most common case)
+     * and then by native thread id (page fusion case).
+     */
+    /* RTMpCpuId had better be cheap. */ 
+    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;
+    }
+
     /* RTThreadGetNativeSelf had better be cheap. */
     RTNATIVETHREAD hThread = RTThreadNativeSelf();
@@ -69 +84 @@
         PVMCPU pVCpu = &pVM->aCpus[idCpu];
 
-        if (pVCpu->hNativeThreadR0 == hThread)
+        if (pVCpu->hNativeThread == hThread)
             return pVCpu->idCpu;
     }
@@ -100 +115 @@
         return &pVM->aCpus[0];
 
+    /* Search first by host cpu id (most common case)
+     * and then by native thread id (page fusion case).
+     */
+
+    /* RTMpCpuId had better be cheap. */ 
+    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;
+    }
+
     /* RTThreadGetNativeSelf had better be cheap. */
     RTNATIVETHREAD hThread = RTThreadNativeSelf();
@@ -108 +139 @@
         PVMCPU pVCpu = &pVM->aCpus[idCpu];
 
-        if (pVCpu->hNativeThreadR0 == hThread)
+        if (pVCpu->hNativeThread == hThread)
             return pVCpu;
     }