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

Timestamp:

Jan 5, 2010 2:32:58 PM (15 years ago)

Author:

vboxsync

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

56363

Message:

iprt: Instrumented semeventmulti-linux.cpp and hacked more on the validator and the testcase.

Location:

trunk/src/VBox/Runtime/common/misc

Files:

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

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

@@ -1233 +1233 @@
     rtLockValidatorCopySrcPos(&pThreadSelf->LockValidator.SrcPos, pSrcPos);
     ASMAtomicWriteBool(&pThreadSelf->LockValidator.fInValidator, true);
+    pThreadSelf->LockValidator.enmRecState = enmSleepState;
     rtThreadSetState(pThreadSelf, enmSleepState);
 
@@ -1260 +1261 @@
         ASMAtomicWriteBool(&pThreadSelf->fReallySleeping, fReallySleeping);
     else
+    {
         rtThreadSetState(pThreadSelf, enmThreadState);
+        rtLockValidatorWriteRecUnionPtr(&pThreadSelf->LockValidator.pRec, NULL);
+    }
     ASMAtomicWriteBool(&pThreadSelf->LockValidator.fInValidator, false);
     return rc;
@@ -1434 +1438 @@
     rtLockValidatorCopySrcPos(&pThreadSelf->LockValidator.SrcPos, pSrcPos);
     ASMAtomicWriteBool(&pThreadSelf->LockValidator.fInValidator, true);
+    pThreadSelf->LockValidator.enmRecState = enmSleepState;
     rtThreadSetState(pThreadSelf, enmSleepState);
 
@@ -1461 +1466 @@
         ASMAtomicWriteBool(&pThreadSelf->fReallySleeping, fReallySleeping);
     else
+    {
         rtThreadSetState(pThreadSelf, enmThreadState);
+        rtLockValidatorWriteRecUnionPtr(&pThreadSelf->LockValidator.pRec, NULL);
+    }
     ASMAtomicWriteBool(&pThreadSelf->LockValidator.fInValidator, false);
     return rc;

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

@@ -1334 +1334 @@
         Assert(pThread == RTThreadSelf());
         ASMAtomicWriteBool(&pThread->fReallySleeping, false);
-        if (rtThreadGetState(pThread) == enmCurState)
+
+        RTTHREADSTATE enmActualState = rtThreadGetState(pThread);
+        if (enmActualState == enmCurState)
+        {
             rtThreadSetState(pThread, RTTHREADSTATE_RUNNING);
+            if (   pThread->LockValidator.pRec
+                && pThread->LockValidator.enmRecState == enmCurState)
+                ASMAtomicWritePtr((void * volatile *)&pThread->LockValidator.pRec, NULL);
+        }
+        /* This is a bit ugly... :-/ */
+        else if (   (   enmActualState == RTTHREADSTATE_TERMINATED
+                     || enmActualState == RTTHREADSTATE_INITIALIZING)
+                 && pThread->LockValidator.pRec)
+            ASMAtomicWritePtr((void * volatile *)&pThread->LockValidator.pRec, NULL);
+        Assert(   pThread->LockValidator.pRec == NULL
+               || RTTHREAD_IS_SLEEPING(enmActualState));
     }
 }