Changeset 25467 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Dec 17, 2009 3:16:55 PM (15 years ago)

Author:

vboxsync

Message:

IPRT,PDMCritSect: More lock validation.

File:

• trunk/src/VBox/Runtime/generic/critsect-generic.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/generic/critsect-generic.cpp

@@ -244 +244 @@
     ASMAtomicWriteHandle(&pCritSect->NativeThreadOwner, NativeThreadSelf);
 #ifdef RTCRITSECT_STRICT
-    RTLockValidatorWriteLockInc(RTLockValidatorSetOwner(pCritSect->pValidatorRec, ThreadSelf, uId, RT_SRC_POS_ARGS));
+    RTLockValidatorSetOwner(pCritSect->pValidatorRec, ThreadSelf, uId, RT_SRC_POS_ARGS);
 #endif
 
@@ -321 +321 @@
         for (;;)
         {
-            RTCRITSECT_STRICT_BLOCK(hThreadSelf, pCritSect->pValidatorRec, !(pCritSect->fFlags & RTCRITSECT_FLAGS_NO_NESTING));
+#ifdef RTCRITSECT_STRICT
+            int rc9 = RTLockValidatorCheckBlocking(pCritSect->pValidatorRec, hThreadSelf, RTTHREADSTATE_CRITSECT,
+                                                   !(pCritSect->fFlags & RTCRITSECT_FLAGS_NO_NESTING),
+                                                   uId, RT_SRC_POS_ARGS);
+            if (RT_FAILURE(rc9))
+            {
+                ASMAtomicDecS32(&pCritSect->cLockers);
+                return rc9;
+            }
+#else
+            RTThreadBlocking(hThreadSelf, RTTHREADSTATE_CRITSECT);
+#endif
+
             int rc = RTSemEventWait(pCritSect->EventSem, RT_INDEFINITE_WAIT);
-            RTCRITSECT_STRICT_UNBLOCK(hThreadSelf);
+
+            RTThreadUnblocked(hThreadSelf, RTTHREADSTATE_CRITSECT);
             if (pCritSect->u32Magic != RTCRITSECT_MAGIC)
                 return VERR_SEM_DESTROYED;
@@ -339 +352 @@
     ASMAtomicWriteHandle(&pCritSect->NativeThreadOwner, NativeThreadSelf);
 #ifdef RTCRITSECT_STRICT
-    RTLockValidatorWriteLockInc(RTLockValidatorSetOwner(pCritSect->pValidatorRec, hThreadSelf, uId, RT_SRC_POS_ARGS));
+    RTLockValidatorSetOwner(pCritSect->pValidatorRec, hThreadSelf, uId, RT_SRC_POS_ARGS);
 #endif
 
@@ -392 +405 @@
          */
 #ifdef RTCRITSECT_STRICT
-        RTLockValidatorWriteLockInc(RTLockValidatorUnsetOwner(pCritSect->pValidatorRec));
+        RTLockValidatorUnsetOwner(pCritSect->pValidatorRec);
 #endif
         ASMAtomicWriteHandle(&pCritSect->NativeThreadOwner, NIL_RTNATIVETHREAD);