Changeset 19596 in vbox for trunk

Timestamp:

May 12, 2009 8:50:33 AM (16 years ago)

Author:

vboxsync

Message:

PDMCritSectIsOwner: pretend critical sections scheduled for release are unowned

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (1 diff)

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

@@ -277 +277 @@
     return RTCritSectIsOwner(&pCritSect->s.Core);
 #else
-    PVM pVM = pCritSect->s.CTX_SUFF(pVM);
-    Assert(pVM); Assert(VMMGetCpu(pVM));
-    return pCritSect->s.Core.NativeThreadOwner == VMMGetCpu(pVM)->hNativeThread;
+    PVM     pVM = pCritSect->s.CTX_SUFF(pVM);
+    PVMCPU  pVCpu = VMMGetCpu(pVM);
+    Assert(pVM); Assert(pVCpu);
+    if (pCritSect->s.Core.NativeThreadOwner != pVCpu->hNativeThread)
+        return false;
+
+    /* Make sure the critical section is not scheduled to be unlocked. */
+    if (!VMCPU_FF_ISSET(pVCpu, VMCPU_FF_PDM_CRITSECT))
+        return true;
+
+    for (unsigned i = 0; i < pVCpu->pdm.s.cQueuedCritSectLeaves; i++)
+    {
+        if (pVCpu->pdm.s.apQueuedCritSectsLeaves[i] == MMHyperCCToR3(pVM, (void *)pCritSect))
+            return false;   /* scheduled for release; pretend it's not owned by us. */
+    }
+    return true;
 #endif
 }