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

Timestamp:

Dec 15, 2009 3:04:41 PM (15 years ago)

Author:

vboxsync

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

56041

Message:

IPRT,PDMCritSect,Main: Moved code dealing with lock counting from RTThread to RTLockValidator. Fixed thread termination assertion on windows.

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• semmutex-posix.cpp (modified) (2 diffs)
• semrw-posix.cpp (modified) (7 diffs)

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

@@ -238 +238 @@
     ASMAtomicWriteU32(&pThis->cNesting, 1);
 #ifdef RTSEMMUTEX_STRICT
-    RTThreadWriteLockInc(RTLockValidatorSetOwner(&pThis->ValidatorRec, hThreadSelf, RTSEMMUTEX_STRICT_POS_ARGS));
+    RTLockValidatorWriteLockInc(RTLockValidatorSetOwner(&pThis->ValidatorRec, hThreadSelf, RTSEMMUTEX_STRICT_POS_ARGS));
 #endif
 
@@ -321 +321 @@
      */
 #ifdef RTSEMMUTEX_STRICT
-    RTThreadWriteLockDec(RTLockValidatorUnsetOwner(&pThis->ValidatorRec));
+    RTLockValidatorWriteLockDec(RTLockValidatorUnsetOwner(&pThis->ValidatorRec));
 #endif
     pThis->Owner = (pthread_t)-1;

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

@@ -33 +33 @@
 *******************************************************************************/
 #include <iprt/semaphore.h>
+#include "internal/iprt.h"
+
+#include <iprt/asm.h>
 #include <iprt/assert.h>
-#include <iprt/alloc.h>
+#include <iprt/err.h>
+#include <iprt/lockvalidator.h>
+#include <iprt/mem.h>
 #include <iprt/thread.h>
-#include <iprt/asm.h>
-#include <iprt/err.h>
 
 #include <errno.h>
@@ -185 +188 @@
 #ifdef RTSEMRW_STRICT
         if (ThreadSelf != NIL_RTTHREAD)
-            RTThreadReadLockInc(ThreadSelf);
+            RTLockValidatorReadLockInc(ThreadSelf);
 #endif
         return VINF_SUCCESS;
@@ -238 +241 @@
 #ifdef RTSEMRW_STRICT
     if (ThreadSelf != NIL_RTTHREAD)
-        RTThreadReadLockInc(ThreadSelf);
+        RTLockValidatorReadLockInc(ThreadSelf);
 #endif
     return VINF_SUCCESS;
@@ -278 +281 @@
 #ifdef RTSEMRW_STRICT
         if (ThreadSelf != NIL_RTTHREAD)
-            RTThreadReadLockDec(ThreadSelf);
+            RTLockValidatorReadLockDec(ThreadSelf);
 #endif
         return VINF_SUCCESS;
@@ -295 +298 @@
 #ifdef RTSEMRW_STRICT
     if (ThreadSelf != NIL_RTTHREAD)
-        RTThreadReadLockDec(ThreadSelf);
+        RTLockValidatorReadLockDec(ThreadSelf);
 #endif
     return VINF_SUCCESS;
@@ -375 +378 @@
     RTTHREAD ThreadSelf = RTThreadSelf();
     if (ThreadSelf != NIL_RTTHREAD)
-        RTThreadWriteLockInc(ThreadSelf);
+        RTLockValidatorWriteLockInc(ThreadSelf);
 #endif
     return VINF_SUCCESS;
@@ -425 +428 @@
     RTTHREAD ThreadSelf = RTThreadSelf();
     if (ThreadSelf != NIL_RTTHREAD)
-        RTThreadWriteLockDec(ThreadSelf);
+        RTLockValidatorWriteLockDec(ThreadSelf);
 #endif
     return VINF_SUCCESS;