Changeset 38944 in vbox

Timestamp:

Oct 5, 2011 2:03:53 PM (13 years ago)

Author:

vboxsync

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

74310

Message:

PDMCritSectLeave: Indicate whether it was a nested exit or a real one.

Location:

trunk

Files:

• include/VBox/vmm/pdmcritsect.h (modified) (1 diff)
• include/iprt/err.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (6 diffs)

trunk/include/VBox/vmm/pdmcritsect.h

@@ -58 +58 @@
 VMMDECL(int)        PDMCritSectTryEnterDebug(PPDMCRITSECT pCritSect, RTHCUINTPTR uId, RT_SRC_POS_DECL);
 VMMR3DECL(int)      PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallRing3);
-VMMDECL(void)       PDMCritSectLeave(PPDMCRITSECT pCritSect);
+VMMDECL(int)        PDMCritSectLeave(PPDMCRITSECT pCritSect);
 VMMDECL(bool)       PDMCritSectIsOwner(PCPDMCRITSECT pCritSect);
 VMMDECL(bool)       PDMCritSectIsOwnerEx(PCPDMCRITSECT pCritSect, PVMCPU pVCpu);

trunk/include/iprt/err.h

@@ -1106 +1106 @@
 /** Nested ownership requests are not permitted for this semaphore type. */
 #define VERR_SEM_NESTED                     (-364)
+/** The release call only release a semaphore nesting, i.e. the caller is still
+ * holding the semaphore. */
+#define VINF_SEM_NESTED                     (364)
 /** Deadlock detected. */
 #define VERR_DEADLOCK                       (-365)

trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

@@ -491 +491 @@
  * Leaves a critical section entered with PDMCritSectEnter().
  *
+ * @returns Indication whether we really exited the critical section.
+ * @retval  VINF_SUCCESS if we really exited.
+ * @retval  VINF_SEM_NESTED if we only reduced the nesting count.
+ * @retval  VERR_NOT_OWNER if you somehow ignore release assertions.
+ *
  * @param   pCritSect           The PDM critical section to leave.
  */
-VMMDECL(void) PDMCritSectLeave(PPDMCRITSECT pCritSect)
+VMMDECL(int) PDMCritSectLeave(PPDMCRITSECT pCritSect)
 {
     AssertMsg(pCritSect->s.Core.u32Magic == RTCRITSECT_MAGIC, ("%p %RX32\n", pCritSect, pCritSect->s.Core.u32Magic));
@@ -500 +505 @@
     /* Check for NOP sections before asserting ownership. */
     if (pCritSect->s.Core.fFlags & RTCRITSECT_FLAGS_NOP)
-        return;
+        return VINF_SUCCESS;
 
     /*
@@ -506 +511 @@
      */
     RTNATIVETHREAD const hNativeSelf = pdmCritSectGetNativeSelf(pCritSect);
-    AssertReleaseMsgReturnVoid(pCritSect->s.Core.NativeThreadOwner == hNativeSelf,
-                               ("%p %s: %p != %p; cLockers=%d cNestings=%d\n", pCritSect, R3STRING(pCritSect->s.pszName),
-                                pCritSect->s.Core.NativeThreadOwner, hNativeSelf,
-                                pCritSect->s.Core.cLockers, pCritSect->s.Core.cNestings));
+    AssertReleaseMsgReturn(pCritSect->s.Core.NativeThreadOwner == hNativeSelf,
+                           ("%p %s: %p != %p; cLockers=%d cNestings=%d\n", pCritSect, R3STRING(pCritSect->s.pszName),
+                            pCritSect->s.Core.NativeThreadOwner, hNativeSelf,
+                            pCritSect->s.Core.cLockers, pCritSect->s.Core.cNestings),
+                           VERR_NOT_OWNER);
     Assert(pCritSect->s.Core.cNestings >= 1);
 
@@ -521 +527 @@
         ASMAtomicDecS32(&pCritSect->s.Core.cLockers);
         Assert(pCritSect->s.Core.cLockers >= 0);
-        return;
+        return VINF_SEM_NESTED;
     }
 
@@ -595 +601 @@
             ASMAtomicWriteHandle(&pCritSect->s.Core.NativeThreadOwner, NIL_RTNATIVETHREAD);
             if (ASMAtomicCmpXchgS32(&pCritSect->s.Core.cLockers, -1, 0))
-                return;
+                return VINF_SUCCESS;
 
             /* darn, someone raced in on us. */
@@ -620 +626 @@
     }
 #endif /* IN_RING0 || IN_RC */
+
+    return VINF_SUCCESS;
 }