Changeset 38035 in vbox for trunk/src/VBox

Timestamp:

Jul 18, 2011 4:19:51 PM (14 years ago)

Author:

vboxsync

Message:

PDMCritSectLeave: Don't leave if we're not the owner, panic instead (later, just ignore).

File:

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

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

@@ -518 +518 @@
         return;
 
-    Assert(pCritSect->s.Core.NativeThreadOwner == pdmCritSectGetNativeSelf(pCritSect));
+    /*
+     * Always check that the caller is the owner (screw performance).
+     */
+    RTNATIVETHREAD const hNativeSelf = pdmCritSectGetNativeSelf(pCritSect);
+    if (RT_UNLIKELY(pCritSect->s.Core.NativeThreadOwner != hNativeSelf))
+    {
+#if 0
+        AssertMsgFailed(("%p %s: %p != %p; cLockers=%d cNestings=%d\n", pCritSect, R3STRING(pCritSect->s.pszName),
+                         pCritSect->s.Core.NativeThreadOwner, hNativeSelf,
+                         pCritSect->s.Core.cLockers, pCritSect->s.Core.cNestings));
+#else
+        AssertReleaseMsgFailed(("%p %s: %p != %p; cLockers=%d cNestings=%d\n", pCritSect, R3STRING(pCritSect->s.pszName),
+                                pCritSect->s.Core.NativeThreadOwner, hNativeSelf,
+                                pCritSect->s.Core.cLockers, pCritSect->s.Core.cNestings));
+#endif
+        return;
+    }
     Assert(pCritSect->s.Core.cNestings >= 1);