Changeset 25478 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 18, 2009 12:58:10 PM (15 years ago)

Author:

vboxsync

Message:

IPRT,PDMCritSect: More lock validator refactoring.

Location:

trunk/src/VBox/VMM

Files:

• PDMCritSect.cpp (modified) (2 diffs)
• VMMAll/PDMAllCritSect.cpp (modified) (16 diffs)

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -396 +396 @@
 
 #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;
+    RTLOCKVALIDATORSRCPOS const SrcPos = pCritSect->s.Core.pValidatorRec->SrcPos;
 #endif
     PDMCritSectLeave(pCritSect);
@@ -423 +420 @@
 
 #ifdef PDMCRITSECT_STRICT
-    int rc = PDMCritSectEnterDebug(pCritSect, VERR_INTERNAL_ERROR, uId, pszFile, iLine, pszFunction);
+    int rc = PDMCritSectEnterDebug(pCritSect, VERR_INTERNAL_ERROR,
+                                   SrcPos.uId, SrcPos.pszFile, SrcPos.uLine, SrcPos.pszFunction);
 #else
     int rc = PDMCritSectEnter(pCritSect, VERR_INTERNAL_ERROR);

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

@@ -52 +52 @@
 #define PDMCRITSECT_SPIN_COUNT_RC       256
 
-#ifdef PDMCRITSECT_STRICT
-# define PDMCRITSECT_STRICT_POS_DECL            RTHCUINTPTR uId, RT_SRC_POS_DECL
-# define PDMCRITSECT_STRICT_POS_ARGS            uId, RT_SRC_POS_ARGS
-# define PDMCRITSECT_STRICT_BLOCK_RET(hThread, pRec, fRecursive) \
-    do { \
-        int rc9 = RTLockValidatorCheckBlocking(pRec, (hThread), RTTHREADSTATE_CRITSECT, fRecursive, uId, RT_SRC_POS_ARGS); \
-        if (RT_FAILURE(rc9)) \
-            return rc9; \
-    } while (0)
-#else
-# define PDMCRITSECT_STRICT_POS_DECL            int iDummy
-# define PDMCRITSECT_STRICT_POS_ARGS            0
-# define PDMCRITSECT_STRICT_BLOCK_RET(hThread, pRec, fRecursive) \
-                                                RTThreadBlocking((hThread), RTTHREADSTATE_CRITSECT)
-#endif
-#define  PDMCRITSECT_STRICT_UNBLOCK(hThread)    RTThreadUnblocked((hThread), RTTHREADSTATE_CRITSECT)
 
 /* Undefine the automatic VBOX_STRICT API mappings. */
@@ -104 +88 @@
  * @param   hNativeSelf     The native handle of this thread.
  */
-DECL_FORCE_INLINE(int) pdmCritSectEnterFirst(PPDMCRITSECT pCritSect, RTNATIVETHREAD hNativeSelf, PDMCRITSECT_STRICT_POS_DECL)
+DECL_FORCE_INLINE(int) pdmCritSectEnterFirst(PPDMCRITSECT pCritSect, RTNATIVETHREAD hNativeSelf, PCRTLOCKVALIDATORSRCPOS pSrcPos)
 {
     AssertMsg(pCritSect->s.Core.NativeThreadOwner == NIL_RTNATIVETHREAD, ("NativeThreadOwner=%p\n", pCritSect->s.Core.NativeThreadOwner));
@@ -113 +97 @@
 
 # ifdef PDMCRITSECT_STRICT
-    RTLockValidatorSetOwner(pCritSect->s.Core.pValidatorRec, NIL_RTTHREAD, PDMCRITSECT_STRICT_POS_ARGS);
+    RTLockValidatorSetOwner(pCritSect->s.Core.pValidatorRec, NIL_RTTHREAD, pSrcPos);
 # endif
 
@@ -129 +113 @@
  * @param   hNativeSelf         The native thread handle.
  */
-static int pdmR3CritSectEnterContended(PPDMCRITSECT pCritSect, RTNATIVETHREAD hNativeSelf, PDMCRITSECT_STRICT_POS_DECL)
+static int pdmR3CritSectEnterContended(PPDMCRITSECT pCritSect, RTNATIVETHREAD hNativeSelf, PCRTLOCKVALIDATORSRCPOS pSrcPos)
 {
     /*
@@ -135 +119 @@
      */
     if (ASMAtomicIncS32(&pCritSect->s.Core.cLockers) == 0)
-        return pdmCritSectEnterFirst(pCritSect, hNativeSelf, PDMCRITSECT_STRICT_POS_ARGS);
+        return pdmCritSectEnterFirst(pCritSect, hNativeSelf, pSrcPos);
     STAM_COUNTER_INC(&pCritSect->s.StatContentionR3);
 
@@ -141 +125 @@
      * The wait loop.
      */
-    PSUPDRVSESSION  pSession = pCritSect->s.CTX_SUFF(pVM)->pSession;
-    SUPSEMEVENT     hEvent   = (SUPSEMEVENT)pCritSect->s.Core.EventSem;
+    PSUPDRVSESSION  pSession    = pCritSect->s.CTX_SUFF(pVM)->pSession;
+    SUPSEMEVENT     hEvent      = (SUPSEMEVENT)pCritSect->s.Core.EventSem;
 # ifdef PDMCRITSECT_STRICT
-    RTTHREAD        hSelf    = RTThreadSelfAutoAdopt();
-    int rc2 = RTLockValidatorCheckOrder(pCritSect->s.Core.pValidatorRec, hSelf, 0, NULL, 0, NULL);
+    RTTHREAD        hThreadSelf = RTThreadSelfAutoAdopt();
+    int rc2 = RTLockValidatorCheckOrder(pCritSect->s.Core.pValidatorRec, hThreadSelf, pSrcPos);
     if (RT_FAILURE(rc2))
         return rc2;
 # else
-    RTTHREAD        hSelf    = RTThreadSelf();
+    RTTHREAD        hThreadSelf = RTThreadSelf();
 # endif
     for (;;)
     {
-        PDMCRITSECT_STRICT_BLOCK_RET(hSelf, pCritSect->s.Core.pValidatorRec, !(pCritSect->s.Core.fFlags & RTCRITSECT_FLAGS_NO_NESTING));
+# ifdef PDMCRITSECT_STRICT
+        int rc9 = RTLockValidatorCheckBlocking(pCritSect->s.Core.pValidatorRec, hThreadSelf, RTTHREADSTATE_CRITSECT,
+                                               !(pCritSect->s.Core.fFlags & RTCRITSECT_FLAGS_NO_NESTING), pSrcPos);
+        if (RT_FAILURE(rc9))
+            return rc9;
+# endif
+
+        RTThreadBlocking(hThreadSelf, RTTHREADSTATE_CRITSECT);
         int rc = SUPSemEventWaitNoResume(pSession, hEvent, RT_INDEFINITE_WAIT);
-        PDMCRITSECT_STRICT_UNBLOCK(hSelf);
+        RTThreadUnblocked(hThreadSelf, RTTHREADSTATE_CRITSECT);
+
         if (RT_UNLIKELY(pCritSect->s.Core.u32Magic != RTCRITSECT_MAGIC))
             return VERR_SEM_DESTROYED;
         if (rc == VINF_SUCCESS)
-            return pdmCritSectEnterFirst(pCritSect, hNativeSelf, PDMCRITSECT_STRICT_POS_ARGS);
+            return pdmCritSectEnterFirst(pCritSect, hNativeSelf, pSrcPos);
         AssertMsg(rc == VERR_INTERRUPTED, ("rc=%Rrc\n", rc));
     }
@@ -178 +170 @@
  *                              and the section is busy.
  */
-DECL_FORCE_INLINE(int) pdmCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy, PDMCRITSECT_STRICT_POS_DECL)
+DECL_FORCE_INLINE(int) pdmCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy, PCRTLOCKVALIDATORSRCPOS pSrcPos)
 {
     Assert(pCritSect->s.Core.cNestings < 8);  /* useful to catch incorrect locking */
@@ -195 +187 @@
     /* Not owned ... */
     if (ASMAtomicCmpXchgS32(&pCritSect->s.Core.cLockers, 0, -1))
-        return pdmCritSectEnterFirst(pCritSect, hNativeSelf, PDMCRITSECT_STRICT_POS_ARGS);
+        return pdmCritSectEnterFirst(pCritSect, hNativeSelf, pSrcPos);
 
     /* ... or nested. */
@@ -215 +207 @@
     {
         if (ASMAtomicCmpXchgS32(&pCritSect->s.Core.cLockers, 0, -1))
-            return pdmCritSectEnterFirst(pCritSect, hNativeSelf, PDMCRITSECT_STRICT_POS_ARGS);
+            return pdmCritSectEnterFirst(pCritSect, hNativeSelf, pSrcPos);
         ASMNopPause();
         /** @todo Should use monitor/mwait on e.g. &cLockers here, possibly with a
@@ -228 +220 @@
      * Take the slow path.
      */
-    return pdmR3CritSectEnterContended(pCritSect, hNativeSelf, PDMCRITSECT_STRICT_POS_ARGS);
+    return pdmR3CritSectEnterContended(pCritSect, hNativeSelf, pSrcPos);
 #else
     /*
@@ -254 +246 @@
 {
 #ifndef PDMCRITSECT_STRICT
-    return pdmCritSectEnter(pCritSect, rcBusy, PDMCRITSECT_STRICT_POS_ARGS);
-#else
-    /* No need for a second code instance. */
-    return PDMCritSectEnterDebug(pCritSect, rcBusy, (uintptr_t)ASMReturnAddress(), RT_SRC_POS);
+    return pdmCritSectEnter(pCritSect, rcBusy, NULL);
+#else
+    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
+    return pdmCritSectEnter(pCritSect, rcBusy, &SrcPos);
 #endif
 }
@@ -283 +275 @@
 {
 #ifdef PDMCRITSECT_STRICT
-    return pdmCritSectEnter(pCritSect, rcBusy, PDMCRITSECT_STRICT_POS_ARGS);
-#else
-    /* No need for a second code instance. */
-    return PDMCritSectEnter(pCritSect, rcBusy);
+    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
+    return pdmCritSectEnter(pCritSect, rcBusy, &SrcPos);
+#else
+    return pdmCritSectEnter(pCritSect, rcBusy, NULL);
 #endif
 }
@@ -301 +293 @@
  * @param   pCritSect   The critical section.
  */
-static int pdmCritSectTryEnter(PPDMCRITSECT pCritSect, PDMCRITSECT_STRICT_POS_DECL)
+static int pdmCritSectTryEnter(PPDMCRITSECT pCritSect, PCRTLOCKVALIDATORSRCPOS pSrcPos)
 {
     /*
@@ -316 +308 @@
     /* Not owned ... */
     if (ASMAtomicCmpXchgS32(&pCritSect->s.Core.cLockers, 0, -1))
-        return pdmCritSectEnterFirst(pCritSect, hNativeSelf, PDMCRITSECT_STRICT_POS_ARGS);
+        return pdmCritSectEnterFirst(pCritSect, hNativeSelf, pSrcPos);
 
     /* ... or nested. */
@@ -355 +347 @@
 {
 #ifndef PDMCRITSECT_STRICT
-    return pdmCritSectTryEnter(pCritSect, PDMCRITSECT_STRICT_POS_ARGS);
-#else
-    /* No need for a second code instance. */
-    return PDMCritSectTryEnterDebug(pCritSect, (uintptr_t)ASMReturnAddress(), RT_SRC_POS);
+    return pdmCritSectTryEnter(pCritSect, NULL);
+#else
+    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
+    return pdmCritSectTryEnter(pCritSect, &SrcPos);
 #endif
 }
@@ -383 +375 @@
 {
 #ifdef PDMCRITSECT_STRICT
-    return pdmCritSectTryEnter(pCritSect, PDMCRITSECT_STRICT_POS_ARGS);
-#else
-    /* No need for a second code instance. */
-    return PDMCritSectTryEnter(pCritSect);
+    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
+    return pdmCritSectTryEnter(pCritSect, &SrcPos);
+#else
+    return pdmCritSectTryEnter(pCritSect, NULL);
 #endif
 }