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

Timestamp:

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

Author:

vboxsync

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

56305

Message:

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

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• semmutex-posix.cpp (modified) (5 diffs)
• semrw-posix.cpp (modified) (12 diffs)

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

@@ -164 +164 @@
     AssertReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, VERR_INVALID_HANDLE);
 
-#ifdef RTSEMMUTEX_STRICT
-    RTTHREAD hThreadSelf = RTThreadSelfAutoAdopt();
-    RTLockValidatorCheckOrder(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
-#endif
-
     /*
      * Check if nested request.
@@ -176 +171 @@
         &&  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
-    RTTHREAD hThreadSelf = RTThreadSelf();
-#endif
 
     /*
      * Lock it.
      */
+    RTTHREAD hThreadSelf = NIL_RTTHREAD;
     if (cMillies != 0)
     {
 #ifdef RTSEMMUTEX_STRICT
-        int rc9 = RTLockValidatorCheckBlocking(&pThis->ValidatorRec, hThreadSelf,
-                                               RTTHREADSTATE_MUTEX, true, pSrcPos);
+        hThreadSelf = RTThreadSelfAutoAdopt();
+        int rc9 = RTLockValidatorRecExclCheckOrderAndBlocking(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true);
         if (RT_FAILURE(rc9))
             return rc9;
+#else
+        hThreadSelf = RTThreadSelf();
 #endif
         RTThreadBlocking(hThreadSelf, RTTHREADSTATE_MUTEX);
@@ -247 +247 @@
     ASMAtomicWriteU32(&pThis->cNesting, 1);
 #ifdef RTSEMMUTEX_STRICT
-    RTLockValidatorSetOwner(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
+    RTLockValidatorRecExclSetOwner(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true);
 #endif
 
@@ -300 +300 @@
     AssertReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, VERR_INVALID_HANDLE);
 
+#ifdef RTSEMMUTEX_STRICT
+    int rc9 = RTLockValidatorRecExclReleaseOwner(&pThis->ValidatorRec, pThis->cNesting == 1);
+    if (RT_FAILURE(rc9))
+        return rc9;
+#endif
+
     /*
      * Check if nested.
@@ -324 +330 @@
      * Clear the state. (cNesting == 1)
      */
-#ifdef RTSEMMUTEX_STRICT
-    RTLockValidatorUnsetOwner(&pThis->ValidatorRec);
-#endif
     pThis->Owner = (pthread_t)-1;
     ASMAtomicXchgU32(&pThis->cNesting, 0);

trunk/src/VBox/Runtime/r3/posix/semrw-posix.cpp

@@ -202 +202 @@
     {
 #ifdef RTSEMRW_STRICT
-        int rc9 = RTLockValidatorRecordReadWriteRecursion(&pThis->ValidatorWrite, &pThis->ValidatorRead, pSrcPos);
+        int rc9 = RTLockValidatorRecExclRecursionMixed(&pThis->ValidatorWrite, &pThis->ValidatorRead->Core, pSrcPos);
         if (RT_FAILURE(rc9))
             return rc9;
@@ -214 +214 @@
      * Try lock it.
      */
-#ifdef RTSEMRW_STRICT
-    RTTHREAD hThreadSelf = RTThreadSelfAutoAdopt();
-#else
-    RTTHREAD hThreadSelf = RTThreadSelf();
-#endif
+    RTTHREAD hThreadSelf = NIL_RTTHREAD;
     if (cMillies > 0)
     {
 #ifdef RTSEMRW_STRICT
-        int rc9 = RTLockValidatorCheckReadOrderBlocking(&pThis->ValidatorRead, &pThis->ValidatorWrite,
-                                                        hThreadSelf, RTTHREADSTATE_RW_READ, false, pSrcPos);
+        hThreadSelf = RTThreadSelfAutoAdopt();
+        int rc9 = RTLockValidatorRecSharedCheckOrderAndBlocking(&pThis->ValidatorRead, hThreadSelf, pSrcPos, true);
         if (RT_FAILURE(rc9))
             return rc9;
+#else
+        hThreadSelf = RTThreadSelf();
 #endif
         RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_READ);
@@ -277 +275 @@
     ASMAtomicIncU32(&pThis->cReaders);
 #ifdef RTSEMRW_STRICT
-    RTLockValidatorAddReadOwner(&pThis->ValidatorRead, hThreadSelf, pSrcPos);
+    RTLockValidatorSharedRecAddOwner(&pThis->ValidatorRead, hThreadSelf, pSrcPos);
 #endif
     return VINF_SUCCESS;
@@ -311 +309 @@
         AssertMsgReturn(pThis->cWriterReads > 0, ("pThis=%p\n", pThis), VERR_NOT_OWNER);
 #ifdef RTSEMRW_STRICT
-        int rc9 = RTLockValidatorUnwindReadWriteRecursion(&pThis->ValidatorWrite, &pThis->ValidatorRead);
+        int rc9 = RTLockValidatorRecExclUnwindMixed(&pThis->ValidatorWrite, &pThis->ValidatorRead->Core.);
         if (RT_FAILURE(rc9))
             return rc9;
@@ -323 +321 @@
      */
 #ifdef RTSEMRW_STRICT
-    int rc9 = RTLockValidatorCheckAndReleaseReadOwner(&pThis->ValidatorRead, RTThreadSelf());
+    int rc9 = RTLockValidatorRecSharedCheckAndRelease(&pThis->ValidatorRead, RTThreadSelf());
     if (RT_FAILURE(rc9))
         return rc9;
@@ -356 +354 @@
                     ("pThis=%p u32Magic=%#x\n", pThis, pThis->u32Magic),
                     VERR_INVALID_HANDLE);
+
     /*
      * Recursion?
@@ -365 +364 @@
     {
 #ifdef RTSEMRW_STRICT
-        int rc9 = RTLockValidatorRecordRecursion(&pThis->ValidatorWrite, pSrcPos);
+        int rc9 = RTLockValidatorRecExclRecursion(&pThis->ValidatorWrite, pSrcPos);
         if (RT_FAILURE(rc9))
             return rc9;
@@ -377 +376 @@
      * Try lock it.
      */
-#ifdef RTSEMRW_STRICT
-    RTTHREAD hThreadSelf = RTThreadSelfAutoAdopt();
-#else
-    RTTHREAD hThreadSelf = RTThreadSelf();
-#endif
+    RTTHREAD hThreadSelf = NIL_RTTHREAD;
     if (cMillies)
     {
 #ifdef RTSEMRW_STRICT
-        int rc9 = RTLockValidatorCheckWriteOrderBlocking(&pThis->ValidatorWrite, &pThis->ValidatorRead,
-                                                         hThreadSelf, RTTHREADSTATE_RW_WRITE, true, pSrcPos);
+        hThreadSelf = RTThreadSelfAutoAdopt();
+        int rc9 = RTLockValidatorRecExclCheckOrderAndBlocking(&pThis->ValidatorWrite, hThreadSelf, pSrcPos, true);
         if (RT_FAILURE(rc9))
             return rc9;
+#else
+        hThreadSelf = RTThreadSelf();
 #endif
         RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_WRITE);
@@ -436 +433 @@
 #endif /* !RT_OS_DARWIN */
     }
+    }
 
     ATOMIC_SET_PTHREAD_T(&pThis->Writer, Self);
@@ -441 +439 @@
     Assert(!pThis->cReaders);
 #ifdef RTSEMRW_STRICT
-    RTLockValidatorSetOwner(&pThis->ValidatorWrite, hThreadSelf, pSrcPos);
+    RTLockValidatorRecExclSetOwner(&pThis->ValidatorWrite, hThreadSelf, pSrcPos, true);
 #endif
     return VINF_SUCCESS;
@@ -508 +506 @@
     {
 #ifdef RTSEMRW_STRICT
-        int rc9 = RTLockValidatorUnwindRecursion(&pThis->ValidatorWrite);
+        int rc9 = RTLockValidatorRecExclUnwind(&pThis->ValidatorWrite);
         if (RT_FAILURE(rc9))
             return rc9;
@@ -521 +519 @@
      */
 #ifdef RTSEMRW_STRICT
-    int rc9 = RTLockValidatorCheckAndRelease(&pThis->ValidatorWrite);
+    int rc9 = RTLockValidatorRecExclReleaseOwner(&pThis->ValidatorWrite);
     if (RT_FAILURE(rc9))
         return rc9;