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

Timestamp:

Jan 2, 2010 12:00:33 PM (15 years ago)

Author:

vboxsync

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

56309

Message:

IPRT,pdmcritsect: More lock validator hacking.

Location:

trunk/src/VBox/Runtime/r3

Files:

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

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

@@ -240 +240 @@
             {
 #ifdef RTSEMMUTEX_STRICT
-                int rc9 = RTLockValidatorRecExclCheckBlocking(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true);
+                int rc9 = RTLockValidatorRecExclCheckBlocking(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true, RTTHREADSTATE_MUTEX);
                 if (RT_FAILURE(rc9))
                     return rc9;
-#endif
+#else
                 RTThreadBlocking(hThreadSelf, RTTHREADSTATE_MUTEX);
+#endif
             }
 

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

@@ -188 +188 @@
 #ifdef RTSEMMUTEX_STRICT
         hThreadSelf = RTThreadSelfAutoAdopt();
-        int rc9 = RTLockValidatorRecExclCheckOrderAndBlocking(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true);
+        int rc9 = RTLockValidatorRecExclCheckOrderAndBlocking(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true, RTTHREADSTATE_MUTEX);
         if (RT_FAILURE(rc9))
             return rc9;
 #else
         hThreadSelf = RTThreadSelf();
-#endif
         RTThreadBlocking(hThreadSelf, RTTHREADSTATE_MUTEX);
+#endif
     }
 

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

@@ -219 +219 @@
 #ifdef RTSEMRW_STRICT
         hThreadSelf = RTThreadSelfAutoAdopt();
-        int rc9 = RTLockValidatorRecSharedCheckOrderAndBlocking(&pThis->ValidatorRead, hThreadSelf, pSrcPos, true);
+        int rc9 = RTLockValidatorRecSharedCheckOrderAndBlocking(&pThis->ValidatorRead, hThreadSelf, pSrcPos, true, RTTHREADSTATE_RW_READ);
         if (RT_FAILURE(rc9))
             return rc9;
 #else
         hThreadSelf = RTThreadSelf();
-#endif
         RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_READ);
+#endif
     }
 
@@ -381 +381 @@
 #ifdef RTSEMRW_STRICT
         hThreadSelf = RTThreadSelfAutoAdopt();
-        int rc9 = RTLockValidatorRecExclCheckOrderAndBlocking(&pThis->ValidatorWrite, hThreadSelf, pSrcPos, true);
+        int rc9 = RTLockValidatorRecExclCheckOrderAndBlocking(&pThis->ValidatorWrite, hThreadSelf, pSrcPos, true, RTTHREADSTATE_RW_WRITE);
         if (RT_FAILURE(rc9))
             return rc9;
 #else
         hThreadSelf = RTThreadSelf();
-#endif
         RTThreadBlocking(hThreadSelf, RTTHREADSTATE_RW_WRITE);
+#endif
     }
 

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

@@ -159 +159 @@
 #ifdef RTSEMMUTEX_STRICT
         hThreadSelf = RTThreadSelfAutoAdopt();
-        int rc9 = RTLockValidatorRecExclCheckOrderAndBlocking(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true);
+        int rc9 = RTLockValidatorRecExclCheckOrderAndBlocking(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true, RTTHREADSTATE_MUTEX);
         if (RT_FAILURE(rc9))
             return rc9;
 #else
         hThreadSelf = RTThreadSelf();
-#endif
         RTThreadBlocking(hThreadSelf, RTTHREADSTATE_MUTEX);
+#endif
     }
     int rc = WaitForSingleObjectEx(pThis->hMtx,