Changeset 25614 in vbox for trunk/src/VBox/Runtime/r3/linux

Timestamp:

Jan 1, 2010 2:19:06 PM (15 years ago)

Author:

vboxsync

Message:

iprt,pdmcritsect: More lock validator refactoring and debugging. Added hooks to semrw-generic.cpp. (Everything is still disabled.)

File:

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

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

@@ -176 +176 @@
     AssertReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, VERR_INVALID_HANDLE);
 
-#ifdef RTSEMMUTEX_STRICT
-    RTTHREAD hThreadSelf = RTThreadSelfAutoAdopt();
-    RTLockValidatorCheckOrder(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
-#endif
-
     /*
      * Check if nested request.
@@ -188 +183 @@
         &&  pThis->cNesting > 0)
     {
+#ifdef RTSEMMUTEX_STRICT
+        int rc9 = RTLockValidatorRecExclRecursion(&pThis->ValidatorRec, pSrcPos);
+        if (RT_FAILURE(rc9))
+            return rc9;
+#endif
         ASMAtomicIncU32(&pThis->cNesting);
         return VINF_SUCCESS;
     }
-#ifndef RTSEMMUTEX_STRICT
+
+#ifdef RTSEMMUTEX_STRICT
+    RTTHREAD hThreadSelf = RTThreadSelfAutoAdopt();
+    if (cMillies)
+    {
+        int rc9 = RTLockValidatorRecExclCheckOrder(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
+        if (RT_FAILURE(rc9))
+            return rc9;
+    }
+#else
     RTTHREAD hThreadSelf = RTThreadSelf();
 #endif
@@ -231 +240 @@
             {
 #ifdef RTSEMMUTEX_STRICT
-                int rc9 = RTLockValidatorCheckBlocking(&pThis->ValidatorRec, hThreadSelf,
-                                                       RTTHREADSTATE_MUTEX, true, pSrcPos);
+                int rc9 = RTLockValidatorRecExclCheckBlocking(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true);
                 if (RT_FAILURE(rc9))
                     return rc9;
@@ -299 +307 @@
     ASMAtomicWriteU32(&pThis->cNesting, 1);
 #ifdef RTSEMMUTEX_STRICT
-    RTLockValidatorSetOwner(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
+    RTLockValidatorRecExclSetOwner(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true);
 #endif
     return VINF_SUCCESS;
@@ -354 +362 @@
     AssertReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, VERR_INVALID_HANDLE);
 
+#ifdef RTSEMMUTEX_STRICT
+    int rc9 = RTLockValidatorRecExclReleaseOwner(&pThis->ValidatorRec, pThis->cNestings != 1);
+    if (RT_FAILURE(rc9))
+        return rc9;
+#endif
+
     /*
      * Check if nested.
@@ -378 +392 @@
      * Clear the state. (cNesting == 1)
      */
-#ifdef RTSEMMUTEX_STRICT
-    RTLockValidatorUnsetOwner(&pThis->ValidatorRec);
-#endif
     pThis->Owner = (pthread_t)~0;
     ASMAtomicWriteU32(&pThis->cNesting, 0);