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

Timestamp:

Nov 4, 2008 4:12:57 PM (16 years ago)

Author:

vboxsync

Message:

Moving data around

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HWACCMAll.cpp (modified) (1 diff)
• PDMAllCritSect.cpp (modified) (6 diffs)

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

@@ -142 +142 @@
 }
 
+#ifndef IN_GC
+/**
+ * Returns the VMCPU id of the current EMT thread.
+ *
+ * @param   pVM         The VM to operate on.
+ */
+VMMDECL(RTCPUID) HWACCMGetVMCPUId(PVM pVM)
+{
+    /* @todo */
+    Assert(pVM->cCPUs == 1);
+    return 0;
+}
+#endif

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

@@ -30 +30 @@
 #include <VBox/vm.h>
 #include <VBox/err.h>
+#include <VBox/hwaccm.h>
 
 #include <VBox/log.h>
@@ -67 +68 @@
     Assert(pVM);
 
-    /*
-     * Try take the lock.
+    RTCPUID idCPU = VM_GET_VMCPUID(pVM);
+
+    /*
+     * Try to take the lock.
      */
     if (ASMAtomicCmpXchgS32(&pCritSect->s.Core.cLockers, 0, -1))
     {
         pCritSect->s.Core.cNestings = 1;
-        ASMAtomicXchgSize(&pCritSect->s.Core.NativeThreadOwner, pVM->NativeThreadEMT);
+        Assert(pVM->aCpu[idCPU].hNativeThread);
+        ASMAtomicXchgSize(&pCritSect->s.Core.NativeThreadOwner, pVM->aCpu[idCPU].hNativeThread);
         STAM_PROFILE_ADV_START(&pCritSect->s.StatLocked, l);
         return VINF_SUCCESS;
@@ -81 +85 @@
      * Nested?
      */
-    if (pCritSect->s.Core.NativeThreadOwner == pVM->NativeThreadEMT)
+    if (pCritSect->s.Core.NativeThreadOwner == pVM->aCpu[idCPU].hNativeThread)
     {
         pCritSect->s.Core.cNestings++;
@@ -159 +163 @@
     PVM pVM = pCritSect->s.CTX_SUFF(pVM);
     Assert(pVM);
-    Assert(pCritSect->s.Core.NativeThreadOwner == pVM->NativeThreadEMT);
+    AssertMsg(pCritSect->s.Core.NativeThreadOwner == pVM->aCpu[VM_GET_VMCPUID(pVM)].hNativeThread, ("Owner %RX64 emt=%RX64\n", pCritSect->s.Core.NativeThreadOwner, pVM->aCpu[VM_GET_VMCPUID(pVM)].hNativeThread));
 
     /*
@@ -183 +187 @@
 
         /* darn, someone raced in on us. */
-        ASMAtomicXchgSize(&pCritSect->s.Core.NativeThreadOwner, pVM->NativeThreadEMT);
+        Assert(pVM->aCpu[VM_GET_VMCPUID(pVM)].hNativeThread);
+        ASMAtomicXchgSize(&pCritSect->s.Core.NativeThreadOwner, pVM->aCpu[VM_GET_VMCPUID(pVM)].hNativeThread);
         STAM_PROFILE_ADV_START(&pCritSect->s.StatLocked, l);
     }
@@ -217 +222 @@
     PVM pVM = pCritSect->s.CTX_SUFF(pVM);
     Assert(pVM);
-    return pCritSect->s.Core.NativeThreadOwner == pVM->NativeThreadEMT;
+    return pCritSect->s.Core.NativeThreadOwner == pVM->aCpu[VM_GET_VMCPUID(pVM)].hNativeThread;
 #endif
 }