Changeset 25409 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

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

Author:

vboxsync

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/common

Files:

• log/log.cpp (modified) (3 diffs)
• misc/lockvalidator.cpp (modified) (2 diffs)
• misc/thread.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -46 +46 @@
 # include <iprt/env.h>
 # include <iprt/file.h>
+# include <iprt/lockvalidator.h>
 # include <iprt/path.h>
 #endif
@@ -412 +413 @@
                     if (Thread != NIL_RTTHREAD)
                     {
-                        int32_t c = RTThreadGetWriteLockCount(Thread);
+                        int32_t c = RTLockValidatorWriteLockGetCount(Thread);
                         RTSemSpinMutexRequest(pLogger->hSpinMtx);
-                        c = RTThreadGetWriteLockCount(Thread) - c;
+                        c = RTLockValidatorWriteLockGetCount(Thread) - c;
                         RTSemSpinMutexRelease(pLogger->hSpinMtx);
                         ASMAtomicWriteU32(&g_cLoggerLockCount, c);
@@ -2525 +2526 @@
                     if (Thread != NIL_RTTHREAD)
                     {
-                        uint32_t cReadLocks  = RTThreadGetReadLockCount(Thread);
-                        uint32_t cWriteLocks = RTThreadGetWriteLockCount(Thread) - g_cLoggerLockCount;
+                        uint32_t cReadLocks  = RTLockValidatorReadLockGetCount(Thread);
+                        uint32_t cWriteLocks = RTLockValidatorWriteLockGetCount(Thread) - g_cLoggerLockCount;
                         cReadLocks  = RT_MIN(0xfff, cReadLocks);
                         cWriteLocks = RT_MIN(0xfff, cWriteLocks);

trunk/src/VBox/Runtime/common/misc/lockvalidator.cpp

@@ -185 +185 @@
     return hThread;
 }
+
+
+RTDECL(int32_t) RTLockValidatorWriteLockGetCount(RTTHREAD Thread)
+{
+    if (Thread == NIL_RTTHREAD)
+        return 0;
+
+    PRTTHREADINT pThread = rtThreadGet(Thread);
+    if (!pThread)
+        return VERR_INVALID_HANDLE;
+    int32_t cWriteLocks = ASMAtomicReadS32(&pThread->LockValidator.cWriteLocks);
+    rtThreadRelease(pThread);
+    return cWriteLocks;
+}
+RT_EXPORT_SYMBOL(RTLockValidatorWriteLockGetCount);
+
+
+RTDECL(void) RTLockValidatorWriteLockInc(RTTHREAD Thread)
+{
+    PRTTHREADINT pThread = rtThreadGet(Thread);
+    AssertReturnVoid(pThread);
+    ASMAtomicIncS32(&pThread->LockValidator.cWriteLocks);
+    rtThreadRelease(pThread);
+}
+RT_EXPORT_SYMBOL(RTLockValidatorWriteLockInc);
+
+
+RTDECL(void) RTLockValidatorWriteLockDec(RTTHREAD Thread)
+{
+    PRTTHREADINT pThread = rtThreadGet(Thread);
+    AssertReturnVoid(pThread);
+    ASMAtomicDecS32(&pThread->LockValidator.cWriteLocks);
+    rtThreadRelease(pThread);
+}
+RT_EXPORT_SYMBOL(RTLockValidatorWriteLockDec);
+
+
+RTDECL(int32_t) RTLockValidatorReadLockGetCount(RTTHREAD Thread)
+{
+    if (Thread == NIL_RTTHREAD)
+        return 0;
+
+    PRTTHREADINT pThread = rtThreadGet(Thread);
+    if (!pThread)
+        return VERR_INVALID_HANDLE;
+    int32_t cReadLocks = ASMAtomicReadS32(&pThread->LockValidator.cReadLocks);
+    rtThreadRelease(pThread);
+    return cReadLocks;
+}
+RT_EXPORT_SYMBOL(RTLockValidatorReadLockGetCount);
+
+
+RTDECL(void) RTLockValidatorReadLockInc(RTTHREAD Thread)
+{
+    PRTTHREADINT pThread = rtThreadGet(Thread);
+    Assert(pThread);
+    ASMAtomicIncS32(&pThread->LockValidator.cReadLocks);
+    rtThreadRelease(pThread);
+}
+RT_EXPORT_SYMBOL(RTLockValidatorReadLockInc);
+
+
+RTDECL(void) RTLockValidatorReadLockDec(RTTHREAD Thread)
+{
+    PRTTHREADINT pThread = rtThreadGet(Thread);
+    Assert(pThread);
+    ASMAtomicDecS32(&pThread->LockValidator.cReadLocks);
+    rtThreadRelease(pThread);
+}
+RT_EXPORT_SYMBOL(RTLockValidatorReadLockDec);
+
 
 
@@ -308 +379 @@
     AssertPtrReturnVoid(pThread);
     AssertReturnVoid(pThread->u32Magic == RTTHREADINT_MAGIC);
-    AssertReturnVoid(rtThreadGetState(pThread) == RTTHREADSTATE_RUNNING);
+    RTTHREADSTATE enmThreadState = rtThreadGetState(pThread);
+    AssertReturnVoid(   enmThreadState == RTTHREADSTATE_RUNNING
+                     || enmThreadState == RTTHREADSTATE_TERMINATED /* rtThreadRemove uses locks too */);
 
     /*

trunk/src/VBox/Runtime/common/misc/thread.cpp

@@ -1203 +1203 @@
 RT_EXPORT_SYMBOL(RTThreadGetType);
 
-
 #ifdef IN_RING3
-
-/**
- * Gets the number of write locks and critical sections the specified
- * thread owns.
- *
- * This number does not include any nested lock/critect entries.
- *
- * Note that it probably will return 0 for non-strict builds since
- * release builds doesn't do unnecessary diagnostic counting like this.
- *
- * @returns Number of locks on success (0+) and VERR_INVALID_HANDLER on failure
- * @param   Thread          The thread we're inquiring about.
- *
- * @todo Move this.
- */
-RTDECL(int32_t) RTThreadGetWriteLockCount(RTTHREAD Thread)
-{
-    if (Thread == NIL_RTTHREAD)
-        return 0;
-
-    PRTTHREADINT pThread = rtThreadGet(Thread);
-    if (!pThread)
-        return VERR_INVALID_HANDLE;
-    int32_t cWriteLocks = ASMAtomicReadS32(&pThread->LockValidator.cWriteLocks);
-    rtThreadRelease(pThread);
-    return cWriteLocks;
-}
-RT_EXPORT_SYMBOL(RTThreadGetWriteLockCount);
-
-
-/**
- * Works the THREADINT::cWriteLocks member, mostly internal.
- *
- * @param   Thread      The current thread.
- *
- * @todo Move this.
- */
-RTDECL(void) RTThreadWriteLockInc(RTTHREAD Thread)
-{
-    PRTTHREADINT pThread = rtThreadGet(Thread);
-    AssertReturnVoid(pThread);
-    ASMAtomicIncS32(&pThread->LockValidator.cWriteLocks);
-    rtThreadRelease(pThread);
-}
-RT_EXPORT_SYMBOL(RTThreadWriteLockInc);
-
-
-/**
- * Works the THREADINT::cWriteLocks member, mostly internal.
- *
- * @param   Thread      The current thread.
- *
- * @todo Move this.
- */
-RTDECL(void) RTThreadWriteLockDec(RTTHREAD Thread)
-{
-    PRTTHREADINT pThread = rtThreadGet(Thread);
-    AssertReturnVoid(pThread);
-    ASMAtomicDecS32(&pThread->LockValidator.cWriteLocks);
-    rtThreadRelease(pThread);
-}
-RT_EXPORT_SYMBOL(RTThreadWriteLockDec);
-
-
-/**
- * Gets the number of read locks the specified thread owns.
- *
- * Note that nesting read lock entry will be included in the
- * total sum. And that it probably will return 0 for non-strict
- * builds since release builds doesn't do unnecessary diagnostic
- * counting like this.
- *
- * @returns Number of read locks on success (0+) and VERR_INVALID_HANDLER on failure
- * @param   Thread          The thread we're inquiring about.
- *
- * @todo Move this.
- */
-RTDECL(int32_t) RTThreadGetReadLockCount(RTTHREAD Thread)
-{
-    if (Thread == NIL_RTTHREAD)
-        return 0;
-
-    PRTTHREADINT pThread = rtThreadGet(Thread);
-    if (!pThread)
-        return VERR_INVALID_HANDLE;
-    int32_t cReadLocks = ASMAtomicReadS32(&pThread->LockValidator.cReadLocks);
-    rtThreadRelease(pThread);
-    return cReadLocks;
-}
-RT_EXPORT_SYMBOL(RTThreadGetReadLockCount);
-
-
-/**
- * Works the THREADINT::cReadLocks member.
- *
- * @param   Thread      The current thread.
- *
- * @todo Move this.
- */
-RTDECL(void) RTThreadReadLockInc(RTTHREAD Thread)
-{
-    PRTTHREADINT pThread = rtThreadGet(Thread);
-    Assert(pThread);
-    ASMAtomicIncS32(&pThread->LockValidator.cReadLocks);
-    rtThreadRelease(pThread);
-}
-RT_EXPORT_SYMBOL(RTThreadReadLockInc);
-
-
-/**
- * Works the THREADINT::cReadLocks member.
- *
- * @param   Thread      The current thread.
- *
- * @todo Move this.
- */
-RTDECL(void) RTThreadReadLockDec(RTTHREAD Thread)
-{
-    PRTTHREADINT pThread = rtThreadGet(Thread);
-    Assert(pThread);
-    ASMAtomicDecS32(&pThread->LockValidator.cReadLocks);
-    rtThreadRelease(pThread);
-}
-RT_EXPORT_SYMBOL(RTThreadReadLockDec);
-
-
-
-
 
 /**