Changeset 25614 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Jan 1, 2010 2:19:06 PM (15 years ago)

Author:

vboxsync

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

56305

Message:

iprt,pdmcritsect: More lock validator refactoring and debugging. Added hooks to semrw-generic.cpp. (Everything is still disabled.)

File:

• trunk/src/VBox/Runtime/r3/win/semmutex-win.cpp (modified) (3 diffs)

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

@@ -151 +151 @@
     AssertReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, VERR_INVALID_HANDLE);
 
-#ifdef RTSEMMUTEX_STRICT
-    RTTHREAD hThreadSelf = RTThreadSelfAutoAdopt();
-    RTLockValidatorCheckOrder(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
-#else
-    RTTHREAD hThreadSelf = RTThreadSelf();
-#endif
-
     /*
      * Lock mutex semaphore.
      */
+    RTTHREAD hThreadSelf = NIL_RTTHREAD;
     if (cMillies > 0)
     {
 #ifdef RTSEMMUTEX_STRICT
-        int rc9 = RTLockValidatorCheckBlocking(&pThis->ValidatorRec, hThreadSelf,
-                                               RTTHREADSTATE_MUTEX, true, pSrcPos);
+        hThreadSelf = RTThreadSelfAutoAdopt();
+        int rc9 = RTLockValidatorRecExclCheckOrderAndBlocking(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true);
         if (RT_FAILURE(rc9))
             return rc9;
+#else
+        hThreadSelf = RTThreadSelf();
 #endif
         RTThreadBlocking(hThreadSelf, RTTHREADSTATE_MUTEX);
@@ -179 +175 @@
         case WAIT_OBJECT_0:
 #ifdef RTSEMMUTEX_STRICT
-            RTLockValidatorSetOwner(&pThis->ValidatorRec, hThreadSelf, pSrcPos);
-#endif
+            RTLockValidatorRecExclSetOwner(&pThis->ValidatorRec, hThreadSelf, pSrcPos, false /* we don't know */);
+#endif
+/** @todo record who owns this thing and avoid kernel calls during recursion. */
             return VINF_SUCCESS;
 
@@ -227 +224 @@
     AssertReturn(pThis->u32Magic == RTSEMMUTEX_MAGIC, VERR_INVALID_HANDLE);
 
+#ifdef RTSEMMUTEX_STRICT
+    int rc9 = RTLockValidatorRecExclReleaseOwner(&pThis->ValidatorRec, false);
+    if (RT_FAILURE(rc9))
+        return rc9;
+#endif
+
     /*
      * Unlock mutex semaphore.
      */
-#ifdef RTSEMMUTEX_STRICT
-    if (   pThis->ValidatorRec.hThread != NIL_RTTHREAD
-        && pThis->ValidatorRec.hThread == RTThreadSelf())
-        RTLockValidatorUnsetOwner(&pThis->ValidatorRec);
-    else
-        AssertMsgFailed(("%p hThread=%RTthrd\n", pThis, pThis->ValidatorRec.hThread));
-#endif
     if (ReleaseMutex(pThis->hMtx))
         return VINF_SUCCESS;