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

Timestamp:

Jan 3, 2010 1:56:34 PM (15 years ago)

Author:

vboxsync

Message:

tstRTLockValidator: testcase improvements.

Location:

trunk/src/VBox/Runtime/common/misc

Files:

• lockvalidator.cpp (modified) (6 diffs)
• thread.cpp (modified) (1 diff)

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

@@ -412 +412 @@
     Assert(pPerThread->cWriteLocks == 0);
     Assert(pPerThread->cReadLocks == 0);
+    Assert(pPerThread->fInValidator == false);
 }
 
@@ -1166 +1167 @@
     rtLockValidatorWriteRecUnionPtr(&pThreadSelf->LockValidator.pRec, pRecU);
     rtLockValidatorCopySrcPos(&pThreadSelf->LockValidator.SrcPos, pSrcPos);
+    ASMAtomicWriteBool(&pThreadSelf->LockValidator.fInValidator, true);
     rtThreadSetState(pThreadSelf, enmSleepState);
 
@@ -1174 +1176 @@
      * isn't any other place to check for this.  semmutex-win.cpp for instance.
      */
+    int rc = VINF_SUCCESS;
     if (rtLockValidatorReadThreadHandle(&pRecU->Excl.hThread) == pThreadSelf)
     {
-        if (fRecursiveOk)
-            return VINF_SUCCESS;
-        rtLockValidatorComplainFirst("Recursion not allowed", pSrcPos, pThreadSelf, pRecU);
-        rtLockValidatorComplainPanic();
+        if (!fRecursiveOk)
+        {
+            rtLockValidatorComplainFirst("Recursion not allowed", pSrcPos, pThreadSelf, pRecU);
+            rtLockValidatorComplainPanic();
+            rc = VERR_SEM_LV_NESTED;
+        }
+    }
+    /*
+     * Perform deadlock detection.
+     */
+    else if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
+        rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
+
+    if (RT_FAILURE(rc))
         rtThreadSetState(pThreadSelf, enmThreadState);
-        return VERR_SEM_LV_NESTED;
-    }
-
-    /*
-     * Perform deadlock detection.
-     */
-    int rc = VINF_SUCCESS;
-    if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
-    {
-        rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
-        if (RT_FAILURE(rc))
-            rtThreadSetState(pThreadSelf, enmThreadState);
-    }
+    ASMAtomicWriteBool(&pThreadSelf->LockValidator.fInValidator, false);
     return rc;
 }
@@ -1365 +1366 @@
     rtLockValidatorWriteRecUnionPtr(&pThreadSelf->LockValidator.pRec, pRecU);
     rtLockValidatorCopySrcPos(&pThreadSelf->LockValidator.SrcPos, pSrcPos);
+    ASMAtomicWriteBool(&pThreadSelf->LockValidator.fInValidator, true);
     rtThreadSetState(pThreadSelf, enmSleepState);
 
@@ -1370 +1372 @@
      * Don't do deadlock detection if we're recursing.
      */
+    int rc = VINF_SUCCESS;
     PRTLOCKVALRECSHRDOWN pEntry = rtLockValidatorRecSharedFindOwner(&pRecU->Shared, pThreadSelf, NULL);
     if (pEntry)
     {
-        if (fRecursiveOk)
-            return VINF_SUCCESS;
-        rtLockValidatorComplainFirst("Recursion not allowed", pSrcPos, pThreadSelf, pRecU);
-        rtLockValidatorComplainPanic();
+        if (!fRecursiveOk)
+        {
+            rtLockValidatorComplainFirst("Recursion not allowed", pSrcPos, pThreadSelf, pRecU);
+            rtLockValidatorComplainPanic();
+            rc =  VERR_SEM_LV_NESTED;
+        }
+    }
+    /*
+     * Perform deadlock detection.
+     */
+    else if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
+        rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
+
+    if (RT_FAILURE(rc))
         rtThreadSetState(pThreadSelf, enmThreadState);
-        return VERR_SEM_LV_NESTED;
-    }
-
-    /*
-     * Perform deadlock detection.
-     */
-    int rc = VINF_SUCCESS;
-    if (!rtLockValidatorIsSimpleNoDeadlockCase(pRecU))
-    {
-        rc = rtLockValidatorDeadlockDetection(pRecU, pThreadSelf, pSrcPos);
-        if (RT_FAILURE(rc))
-            rtThreadSetState(pThreadSelf, enmThreadState);
-    }
+    ASMAtomicWriteBool(&pThreadSelf->LockValidator.fInValidator, false);
     return rc;
 }
@@ -1860 +1861 @@
 
 
+RTDECL(bool) RTLockValidatorIsBlockedThreadInValidator(RTTHREAD hThread)
+{
+    bool            fRet    = false;
+    PRTTHREADINT    pThread = rtThreadGet(hThread);
+    if (pThread)
+    {
+        fRet = ASMAtomicReadBool(&pThread->LockValidator.fInValidator);
+        rtThreadRelease(pThread);
+    }
+    return fRet;
+}
+RT_EXPORT_SYMBOL(RTLockValidatorIsBlockedThreadInValidator);
+
+
 RTDECL(bool) RTLockValidatorSetEnabled(bool fEnabled)
 {

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

@@ -1305 +1305 @@
     Assert(RTTHREAD_IS_SLEEPING(enmState));
     PRTTHREADINT pThread = hThread;
-    if (hThread && rtThreadGetState(pThread) == RTTHREADSTATE_RUNNING)
+    if (pThread && rtThreadGetState(pThread) == RTTHREADSTATE_RUNNING)
         rtThreadSetState(pThread, enmState);
 }