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

Timestamp:

Jan 4, 2010 4:08:04 PM (15 years ago)

Author:

vboxsync

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

56338

Message:

iprt,pdmcritsect: Added RTSemEvent[Set|Add|Remove]Signaller so that we can validate who is signalling an event if we like and, more importantly, detect deadlocks involving event semaphores. More attempts at dealing with the races (and bugs) in the all-other-threads-blocking detection in tstRTLockValidator.cpp, adding RTThreadGetReallySleeping and RTThreadGetNativeState in the process.

Location:

trunk/src/VBox/Runtime/generic

Files:

• RTThreadGetNativeState-generic.cpp (added)
• critsect-generic.cpp (modified) (2 diffs)
• semrw-generic.cpp (modified) (5 diffs)

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

@@ -208 +208 @@
         {
 #ifdef RTCRITSECT_STRICT
-            int rc9 = RTLockValidatorRecExclCheckBlocking(pCritSect->pValidatorRec, hThreadSelf, pSrcPos,
-                                                          !(pCritSect->fFlags & RTCRITSECT_FLAGS_NO_NESTING),
-                                                          RTTHREADSTATE_CRITSECT);
+            rc9 = RTLockValidatorRecExclCheckBlocking(pCritSect->pValidatorRec, hThreadSelf, pSrcPos,
+                                                      !(pCritSect->fFlags & RTCRITSECT_FLAGS_NO_NESTING),
+                                                      RTTHREADSTATE_CRITSECT, false);
             if (RT_FAILURE(rc9))
             {
@@ -217 +217 @@
             }
 #else
-            RTThreadBlocking(hThreadSelf, RTTHREADSTATE_CRITSECT);
+            RTThreadBlocking(hThreadSelf, RTTHREADSTATE_CRITSECT, false);
 #endif
             int rc = RTSemEventWait(pCritSect->EventSem, RT_INDEFINITE_WAIT);

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

@@ -136 +136 @@
 #ifdef RTSEMRW_STRICT
                         RTLockValidatorRecExclInit(&pThis->ValidatorWrite, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
-                        RTLockValidatorRecSharedInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
+                        RTLockValidatorRecSharedInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis, false /*fSignaller*/);
                         RTLockValidatorRecMakeSiblings(&pThis->ValidatorWrite.Core, &pThis->ValidatorRead.Core);
 #endif
@@ -272 +272 @@
         Assert(pThis->cReads > 0);
 #ifdef RTSEMRW_STRICT
-        RTLockValidatorSharedRecAddOwner(&pThis->ValidatorRead, hThreadSelf, pSrcPos);
+        RTLockValidatorRecSharedAddOwner(&pThis->ValidatorRead, hThreadSelf, pSrcPos);
 #endif
 
@@ -324 +324 @@
         }
 #ifdef RTSEMRW_STRICT
-        rc = RTLockValidatorRecSharedCheckBlocking(&pThis->ValidatorRead, hThreadSelf, pSrcPos, true, RTTHREADSTATE_RW_READ);
+        rc = RTLockValidatorRecSharedCheckBlocking(&pThis->ValidatorRead, hThreadSelf, pSrcPos, true,
+                                                   RTTHREADSTATE_RW_READ, false);
         if (RT_FAILURE(rc))
             break;
 #else
-        RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_READ);
+        RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_READ, false);
 #endif
         int rcWait;
@@ -368 +369 @@
             Assert(pThis->cReads > 0);
 #ifdef RTSEMRW_STRICT
-            RTLockValidatorSharedRecAddOwner(&pThis->ValidatorRead, hThreadSelf, pSrcPos);
+            RTLockValidatorRecSharedAddOwner(&pThis->ValidatorRead, hThreadSelf, pSrcPos);
 #endif
 
@@ -612 +613 @@
 
 #ifdef RTSEMRW_STRICT
-        rc = RTLockValidatorRecExclCheckBlocking(&pThis->ValidatorWrite, hThreadSelf, pSrcPos, true, RTTHREADSTATE_RW_WRITE);
+        rc = RTLockValidatorRecExclCheckBlocking(&pThis->ValidatorWrite, hThreadSelf, pSrcPos, true,
+                                                 RTTHREADSTATE_RW_WRITE, false);
         if (RT_FAILURE(rc))
             break;
 #else
-        RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_WRITE);
+        RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_WRITE, false);
 #endif
         int rcWait;