Changeset 21548 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 13, 2009 4:27:56 PM (16 years ago)

Author:

vboxsync

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

50021

Message:

semspinmutex-r0drv-generic.c: Two bugfixes, more assertions.

File:

• trunk/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c (modified) (6 diffs)

trunk/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c

@@ -253 +253 @@
     int                     rc;
 
+    Assert(hSelf != NIL_RTNATIVETHREAD);
     RTSEMSPINMUTEX_VALIDATE_RETURN(pThis);
 
@@ -298 +299 @@
     int                     rc;
 
+    Assert(hSelf != NIL_RTNATIVETHREAD);
     RTSEMSPINMUTEX_VALIDATE_RETURN(pThis);
 
@@ -304 +306 @@
      */
     rc = rtSemSpinMutexEnter(&State, pThis);
-    if (RT_SUCCESS(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -370 +372 @@
      */
     pThis->SavedState = State;
+    Assert(pThis->hOwner == hSelf);
     return VINF_SUCCESS;
 }
@@ -383 +386 @@
     bool                    fRc;
 
+    Assert(hSelf != NIL_RTNATIVETHREAD);
     RTSEMSPINMUTEX_VALIDATE_RETURN(pThis);
 
@@ -391 +395 @@
     ASMCompilerBarrier();
     ASMAtomicCmpXchgHandle(&pThis->hOwner, NIL_RTNATIVETHREAD, hSelf, fRc);
-    AssertReturn(fRc, VERR_NOT_OWNER);
+    AssertMsgReturn(fRc,
+                    ("hOwner=%p hSelf=%p cLockers=%d\n", pThis->hOwner, hSelf, pThis->cLockers),
+                    VERR_NOT_OWNER);
 
     cLockers = ASMAtomicDecS32(&pThis->cLockers);
+    rtSemSpinMutexLeave(&State);
     if (cLockers > 0)
     {