Changeset 25715 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Jan 11, 2010 12:44:55 PM (15 years ago)

Author:

vboxsync

Message:

semmutex-linux.cpp: lock validation fixes

File:

• trunk/src/VBox/Runtime/r3/linux/semmutex-linux.cpp (modified) (12 diffs)

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

@@ -74 +74 @@
     int32_t volatile    iState;
     /** Nesting count. */
-    uint32_t volatile   cNesting;
+    uint32_t volatile   cNestings;
     /** The owner of the mutex. */
     pthread_t volatile  Owner;
@@ -86 +86 @@
 
 
-/* Undefine debug mappings. */
-#undef RTSemMutexRequest
-#undef RTSemMutexRequestNoResume
-
 
 /**
@@ -125 +121 @@
     if (pThis)
     {
-        pThis->u32Magic = RTSEMMUTEX_MAGIC;
-        pThis->iState   = 0;
-        pThis->Owner    = (pthread_t)~0;
-        pThis->cNesting = 0;
+        pThis->u32Magic     = RTSEMMUTEX_MAGIC;
+        pThis->iState       = 0;
+        pThis->Owner        = (pthread_t)~0;
+        pThis->cNestings    = 0;
 #ifdef RTSEMMUTEX_STRICT
         va_list va;
@@ -167 +163 @@
         usleep(1000);
     }
-    pThis->Owner    = (pthread_t)~0;
-    pThis->cNesting = 0;
+    pThis->Owner        = (pthread_t)~0;
+    pThis->cNestings    = 0;
 #ifdef RTSEMMUTEX_STRICT
     RTLockValidatorRecExclDelete(&pThis->ValidatorRec);
@@ -212 +208 @@
     pthread_t Self = pthread_self();
     if (    pThis->Owner == Self
-        &&  pThis->cNesting > 0)
+        &&  pThis->cNestings > 0)
     {
 #ifdef RTSEMMUTEX_STRICT
@@ -219 +215 @@
             return rc9;
 #endif
-        ASMAtomicIncU32(&pThis->cNesting);
+        ASMAtomicIncU32(&pThis->cNestings);
         return VINF_SUCCESS;
     }
@@ -338 +334 @@
      */
     pThis->Owner = Self;
-    ASMAtomicWriteU32(&pThis->cNesting, 1);
+    ASMAtomicWriteU32(&pThis->cNestings, 1);
 #ifdef RTSEMMUTEX_STRICT
     RTLockValidatorRecExclSetOwner(&pThis->ValidatorRec, hThreadSelf, pSrcPos, true);
@@ -346 +342 @@
 
 
+#undef RTSemMutexRequest
 RTDECL(int) RTSemMutexRequest(RTSEMMUTEX MutexSem, unsigned cMillies)
 {
@@ -368 +365 @@
 
 
+#undef RTSemMutexRequestNoResume
 RTDECL(int) RTSemMutexRequestNoResume(RTSEMMUTEX MutexSem, unsigned cMillies)
 {
@@ -396 +394 @@
 
 #ifdef RTSEMMUTEX_STRICT
-    int rc9 = RTLockValidatorRecExclReleaseOwner(&pThis->ValidatorRec, pThis->cNestings != 1);
+    int rc9 = RTLockValidatorRecExclReleaseOwner(&pThis->ValidatorRec, pThis->cNestings == 1);
     if (RT_FAILURE(rc9))
         return rc9;
@@ -406 +404 @@
     pthread_t Self = pthread_self();
     if (RT_UNLIKELY(    pThis->Owner != Self
-                    ||  pThis->cNesting == 0))
-    {
-        AssertMsgFailed(("Not owner of mutex %p!! Self=%08x Owner=%08x cNesting=%d\n",
-                         pThis, Self, pThis->Owner, pThis->cNesting));
+                    ||  pThis->cNestings == 0))
+    {
+        AssertMsgFailed(("Not owner of mutex %p!! Self=%08x Owner=%08x cNestings=%d\n",
+                         pThis, Self, pThis->Owner, pThis->cNestings));
         return VERR_NOT_OWNER;
     }
@@ -416 +414 @@
      * If nested we'll just pop a nesting.
      */
-    if (pThis->cNesting > 1)
-    {
-        ASMAtomicDecU32(&pThis->cNesting);
+    if (pThis->cNestings > 1)
+    {
+        ASMAtomicDecU32(&pThis->cNestings);
         return VINF_SUCCESS;
     }
 
     /*
-     * Clear the state. (cNesting == 1)
+     * Clear the state. (cNestings == 1)
      */
     pThis->Owner = (pthread_t)~0;
-    ASMAtomicWriteU32(&pThis->cNesting, 0);
+    ASMAtomicWriteU32(&pThis->cNestings, 0);
 
     /*