Changeset 25368 in vbox for trunk/src/VBox/VMM/PDMCritSect.cpp

Timestamp:

Dec 14, 2009 4:31:40 PM (15 years ago)

Author:

vboxsync

Message:

RTCritSect,PDMCritSect,iprt/lockvalidator.h: Reworked the deadlocking detection for critical sections and preparing for lock order validation. This change generalizes the RTCRITSECT::Strict data and moves it out of the RTCRITSECT, leaving a pointer behind. This saves a bit of space in release builds.

File:

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

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -126 +126 @@
     if (RT_SUCCESS(rc))
     {
-        /*
-         * Initialize the structure (first bit is c&p from RTCritSectInitEx).
-         */
-        pCritSect->Core.u32Magic             = RTCRITSECT_MAGIC;
-        pCritSect->Core.fFlags               = 0;
-        pCritSect->Core.cNestings            = 0;
-        pCritSect->Core.cLockers             = -1;
-        pCritSect->Core.NativeThreadOwner    = NIL_RTNATIVETHREAD;
-        pCritSect->Core.Strict.ThreadOwner   = NIL_RTTHREAD;
-        pCritSect->Core.Strict.pszEnterFile  = NULL;
-        pCritSect->Core.Strict.u32EnterLine  = 0;
-        pCritSect->Core.Strict.uEnterId      = 0;
-        pCritSect->pVMR3                     = pVM;
-        pCritSect->pVMR0                     = pVM->pVMR0;
-        pCritSect->pVMRC                     = pVM->pVMRC;
-        pCritSect->pvKey                     = pvKey;
-        pCritSect->EventToSignal             = NIL_RTSEMEVENT;
-        pCritSect->pNext                     = pVM->pdm.s.pCritSects;
-        pCritSect->pszName                   = RTStrDup(pszName);
-        pVM->pdm.s.pCritSects = pCritSect;
-        STAMR3RegisterF(pVM, &pCritSect->StatContentionRZLock,  STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZLock", pszName);
-        STAMR3RegisterF(pVM, &pCritSect->StatContentionRZUnlock,STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZUnlock", pszName);
-        STAMR3RegisterF(pVM, &pCritSect->StatContentionR3,      STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR3", pszName);
+        rc = RTLockValidatorCreate(&pCritSect->Core.pValidatorRec, NIL_RTLOCKVALIDATORCLASS, 0, pszName, pCritSect);
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * Initialize the structure (first bit is c&p from RTCritSectInitEx).
+             */
+            pCritSect->Core.u32Magic             = RTCRITSECT_MAGIC;
+            pCritSect->Core.fFlags               = 0;
+            pCritSect->Core.cNestings            = 0;
+            pCritSect->Core.cLockers             = -1;
+            pCritSect->Core.NativeThreadOwner    = NIL_RTNATIVETHREAD;
+            pCritSect->pVMR3                     = pVM;
+            pCritSect->pVMR0                     = pVM->pVMR0;
+            pCritSect->pVMRC                     = pVM->pVMRC;
+            pCritSect->pvKey                     = pvKey;
+            pCritSect->EventToSignal             = NIL_RTSEMEVENT;
+            pCritSect->pNext                     = pVM->pdm.s.pCritSects;
+            pCritSect->pszName                   = RTStrDup(pszName);
+            pVM->pdm.s.pCritSects = pCritSect;
+            STAMR3RegisterF(pVM, &pCritSect->StatContentionRZLock,  STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZLock", pszName);
+            STAMR3RegisterF(pVM, &pCritSect->StatContentionRZUnlock,STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZUnlock", pszName);
+            STAMR3RegisterF(pVM, &pCritSect->StatContentionR3,      STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR3", pszName);
 #ifdef VBOX_WITH_STATISTICS
-        STAMR3RegisterF(pVM, &pCritSect->StatLocked,        STAMTYPE_PROFILE_ADV, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_OCCURENCE, NULL, "/PDM/CritSects/%s/Locked", pszName);
+            STAMR3RegisterF(pVM, &pCritSect->StatLocked,        STAMTYPE_PROFILE_ADV, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_OCCURENCE, NULL, "/PDM/CritSects/%s/Locked", pszName);
 #endif
+            return VINF_SUCCESS;
+        }
+
+        SUPSemEventClose(pVM->pSession, (SUPSEMEVENT)pCritSect->Core.EventSem);
     }
     return rc;
@@ -241 +244 @@
     int rc = SUPSemEventClose(pVM->pSession, hEvent);
     AssertRC(rc);
+    RTLockValidatorDestroy(&pCritSect->Core.pValidatorRec);
     pCritSect->pNext   = NULL;
     pCritSect->pvKey   = NULL;
@@ -390 +394 @@
         return false;
 
+#ifdef PDMCRITSECT_STRICT
+    const char * const pszFile      = pCritSect->s.Core.pValidatorRec->pszFile;
+    const char * const pszFunction  = pCritSect->s.Core.pValidatorRec->pszFunction;
+    uint32_t     const iLine        = pCritSect->s.Core.pValidatorRec->uLine;
+    RTHCUINTPTR  const uId          = pCritSect->s.Core.pValidatorRec->uId;
+#endif
     PDMCritSectLeave(pCritSect);
 
@@ -411 +421 @@
     }
 
+#ifdef PDMCRITSECT_STRICT
+    int rc = PDMCritSectEnterDebug(pCritSect, VERR_INTERNAL_ERROR, uId, pszFile, iLine, pszFunction);
+#else
     int rc = PDMCritSectEnter(pCritSect, VERR_INTERNAL_ERROR);
+#endif
     AssertLogRelRC(rc);
     return true;