Changeset 25491 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Dec 18, 2009 3:20:48 PM (15 years ago)

Author:

vboxsync

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

56162

Message:

IPRT,PDMCritSect: Fixing critsect regression; contains under construction rw deadlock detection code.

Location:

trunk/src/VBox/Runtime/r3

Files:

• linux/semmutex-linux.cpp (modified) (2 diffs)
• posix/semmutex-posix.cpp (modified) (2 diffs)
• posix/semrw-posix.cpp (modified) (9 diffs)
• win/semmutex-win.cpp (modified) (2 diffs)

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

@@ -120 +120 @@
         pThis->cNesting = 0;
 #ifdef RTSEMMUTEX_STRICT
-        RTLockValidatorInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+        RTLockValidatorRecInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
 #endif
 
@@ -156 +156 @@
     pThis->cNesting = 0;
 #ifdef RTSEMMUTEX_STRICT
-    RTLockValidatorDelete(&pThis->ValidatorRec);
+    RTLockValidatorRecDelete(&pThis->ValidatorRec);
 #endif
 

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

@@ -102 +102 @@
                 pThis->u32Magic = RTSEMMUTEX_MAGIC;
 #ifdef RTSEMMUTEX_STRICT
-                RTLockValidatorInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+                RTLockValidatorRecInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
 #endif
 
@@ -147 +147 @@
     pThis->cNesting = UINT32_MAX;
 #ifdef RTSEMMUTEX_STRICT
-    RTLockValidatorDelete(&pThis->ValidatorRec);
+    RTLockValidatorRecDelete(&pThis->ValidatorRec);
 #endif
     RTMemTmpFree(pThis);

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

@@ -85 +85 @@
 #ifdef RTSEMRW_STRICT
     /** The validator record for the writer. */
-    RTLOCKVALIDATORREC  ValidatorRec;
+    RTLOCKVALIDATORREC      ValidatorWrite;
+    /** The validator record for the readers. */
+    RTLOCKVALIDATORSHARED   ValidatorRead;
 #endif
 };
@@ -116 +118 @@
                 pThis->Writer = (pthread_t)-1;
 #ifdef RTSEMRW_STRICT
-                RTLockValidatorInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+                RTLockValidatorRecInit(&pThis->ValidatorWrite, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+                RTLockValidatorSharedRecInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
 #endif
                 *pRWSem = pThis;
@@ -157 +160 @@
     {
 #ifdef RTSEMRW_STRICT
-        RTLockValidatorInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+        RTLockValidatorSharedRecDelete(&pThis->ValidatorRead);
+        RTLockValidatorRecDelete(&pThis->ValidatorWrite);
 #endif
         RTMemFree(pThis);
@@ -327 +331 @@
 #ifdef RTSEMRW_STRICT
     RTTHREAD hThreadSelf = RTThreadSelfAutoAdopt();
-    RTLockValidatorCheckOrder(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
+    RTLockValidatorCheckOrder(&pThis->ValidatorWrite, hThreadSelf, pSrcPos);
 #endif
 
@@ -339 +343 @@
     {
 #ifdef RTSEMRW_STRICT
-        int rc9 = RTLockValidatorRecordRecursion(&pThis->ValidatorRec, pSrcPos);
+        int rc9 = RTLockValidatorRecordRecursion(&pThis->ValidatorWrite, pSrcPos);
         if (RT_FAILURE(rc9))
             return rc9;
@@ -357 +361 @@
     {
 #ifdef RTSEMRW_STRICT
-        int rc9 = RTLockValidatorCheckBlocking(&pThis->ValidatorRec, hThreadSelf, RTTHREADSTATE_RW_WRITE, true, pSrcPos);
+        int rc9 = RTLockValidatorCheckBlocking(&pThis->ValidatorWrite, hThreadSelf, RTTHREADSTATE_RW_WRITE, true, pSrcPos);
         if (RT_FAILURE(rc9))
             return rc9;
@@ -411 +415 @@
     pThis->cWrites = 1;
 #ifdef RTSEMRW_STRICT
-    RTLockValidatorSetOwner(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
+    RTLockValidatorSetOwner(&pThis->ValidatorWrite, hThreadSelf, pSrcPos);
 #endif
     return VINF_SUCCESS;
@@ -479 +483 @@
     {
 #ifdef RTSEMRW_STRICT
-        RTLockValidatorRecordUnwind(&pThis->ValidatorRec);
+        RTLockValidatorRecordUnwind(&pThis->ValidatorWrite);
 #endif
         return VINF_SUCCESS;
@@ -488 +492 @@
      */
 #ifdef RTSEMRW_STRICT
-    RTLockValidatorCheckReleaseOrder(&pThis->ValidatorRec);
-    RTLockValidatorUnsetOwner(&pThis->ValidatorRec);
+    RTLockValidatorCheckReleaseOrder(&pThis->ValidatorWrite);
+    RTLockValidatorUnsetOwner(&pThis->ValidatorWrite);
 #endif
 

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

@@ -87 +87 @@
             pThis->hMtx = hMtx;
 #ifdef RTSEMMUTEX_STRICT
-            RTLockValidatorInit(&pThis->ValidatorRec,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
+            RTLockValidatorRecInit(&pThis->ValidatorRec,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, NULL, pThis);
 #endif
             *pMutexSem = pThis;
@@ -127 +127 @@
 
 #ifdef RTSEMMUTEX_STRICT
-    RTLockValidatorDelete(&pThis->ValidatorRec);
+    RTLockValidatorRecDelete(&pThis->ValidatorRec);
 #endif
     RTMemFree(pThis);