Changeset 25478 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56147

Message:

IPRT,PDMCritSect: More lock validator refactoring.

File:

• trunk/src/VBox/Runtime/r3/win/semmutex-win.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r3/win/semmutex-win.cpp

@@ -138 +138 @@
  *
  * @returns Same as RTSEmMutexRequestNoResume
- * @param   MutexSem                    The mutex handle.
- * @param   cMillies                    The number of milliseconds to wait.
- * @param   TSEMMUTEX_STRICT_POS_DECL   The source position of the caller.
+ * @param   MutexSem            The mutex handle.
+ * @param   cMillies            The number of milliseconds to wait.
+ * @param   pSrcPos             The source position of the caller.
  */
-DECL_FORCE_INLINE(int) rtSemMutexRequestNoResume(RTSEMMUTEX MutexSem, unsigned cMillies, RTSEMMUTEX_STRICT_POS_DECL)
+DECL_FORCE_INLINE(int) rtSemMutexRequestNoResume(RTSEMMUTEX MutexSem, unsigned cMillies, PCRTLOCKVALIDATORSRCPOS pSrcPos)
 {
     /*
@@ -153 +153 @@
 #ifdef RTSEMMUTEX_STRICT
     RTTHREAD hThreadSelf = RTThreadSelfAutoAdopt();
-    RTLockValidatorCheckOrder(&pThis->ValidatorRec, hThreadSelf, RTSEMMUTEX_STRICT_POS_ARGS);
+    RTLockValidatorCheckOrder(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
 #else
     RTTHREAD hThreadSelf = RTThreadSelf();
@@ -165 +165 @@
 #ifdef RTSEMMUTEX_STRICT
         int rc9 = RTLockValidatorCheckBlocking(&pThis->ValidatorRec, hThreadSelf,
-                                               RTTHREADSTATE_MUTEX, true, uId, RT_SRC_POS_ARGS);
+                                               RTTHREADSTATE_MUTEX, true, pSrcPos);
         if (RT_FAILURE(rc9))
             return rc9;
-#else
+#endif
         RTThreadBlocking(hThreadSelf, RTTHREADSTATE_MUTEX);
-#endif
     }
     int rc = WaitForSingleObjectEx(pThis->hMtx,
@@ -180 +179 @@
         case WAIT_OBJECT_0:
 #ifdef RTSEMMUTEX_STRICT
-            RTLockValidatorSetOwner(&pThis->ValidatorRec, hThreadSelf, RTSEMMUTEX_STRICT_POS_ARGS);
+            RTLockValidatorSetOwner(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
 #endif
             return VINF_SUCCESS;
@@ -204 +203 @@
 {
 #ifndef RTSEMMUTEX_STRICT
-    return rtSemMutexRequestNoResume(MutexSem, cMillies, RTSEMMUTEX_STRICT_POS_ARGS);
+    return rtSemMutexRequestNoResume(MutexSem, cMillies, NULL);
 #else
-    return RTSemMutexRequestNoResumeDebug(MutexSem, cMillies, (uintptr_t)ASMReturnAddress(), RT_SRC_POS);
+    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
+    return rtSemMutexRequestNoResume(MutexSem, cMillies, &SrcPos);
 #endif
 }
@@ -213 +213 @@
 RTDECL(int) RTSemMutexRequestNoResumeDebug(RTSEMMUTEX MutexSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
 {
-#ifdef RTSEMMUTEX_STRICT
-    return rtSemMutexRequestNoResume(MutexSem, cMillies, RTSEMMUTEX_STRICT_POS_ARGS);
-#else
-    return RTSemMutexRequestNoResume(MutexSem, cMillies);
-#endif
+    RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
+    return rtSemMutexRequestNoResume(MutexSem, cMillies, &SrcPos);
 }