Changeset 8677 in vbox

Timestamp:

May 7, 2008 6:13:32 PM (17 years ago)

Author:

vboxsync

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

30610

Message:

Fixed lock accounting for locks aquired via VMM[GC|R0]CallHost.

Location:

trunk

Files:

• include/VBox/pdmcritsect.h (modified) (2 diffs)
• src/VBox/VMM/PDM.cpp (modified) (2 diffs)
• src/VBox/VMM/PGM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (2 diffs)

trunk/include/VBox/pdmcritsect.h

@@ -74 +74 @@
 
 /**
- * Leaves a critical section entered with PDMCritSectEnter().
+ * Enters a PDM critical section.
  *
  * @returns VINF_SUCCESS if entered successfully.
@@ -85 +85 @@
  */
 PDMDECL(int) PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy);
+
+/**
+ * Enters a PDM critical section.
+ *
+ * @returns VINF_SUCCESS if entered successfully.
+ * @returns rcBusy when encountering a busy critical section in GC/R0.
+ * @returns VERR_SEM_DESTROYED if the critical section is dead.
+ *
+ * @param   pCritSect           The PDM critical section to enter.
+ * @param   fCallHost           Whether this is a VMMGCCallHost() or VMMR0CallHost() request.
+ */
+PDMR3DECL(int) PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallHost);
 
 /**

trunk/src/VBox/VMM/PDM.cpp

@@ -1182 +1182 @@
 
 /**
- * Serivce a VMMCALLHOST_PDM_LOCK call.
+ * Service a VMMCALLHOST_PDM_LOCK call.
  *
  * @returns VBox status code.
@@ -1189 +1189 @@
 PDMR3DECL(int) PDMR3LockCall(PVM pVM)
 {
-    return pdmLockEx(pVM, VERR_INTERNAL_ERROR);
-}
-
+#ifdef VBOX_WITH_PDM_LOCK
+    return PDMR3CritSectEnterEx(&pVM->pdm.s.CritSect, true /* fHostCall */);
+#else
+    return VINF_SUCCESS;
+#endif
+}
+

trunk/src/VBox/VMM/PGM.cpp

@@ -2313 +2313 @@
 PDMR3DECL(int) PGMR3LockCall(PVM pVM)
 {
-    return pgmLock(pVM);
+    int rc = PDMR3CritSectEnterEx(&pVM->pgm.s.CritSect, true /* fHostCall */);
+    AssertRC(rc);
+    return rc;
 }
 

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

@@ -36 +36 @@
 #ifdef IN_RING3
 # include <iprt/semaphore.h>
-#endif 
-
-
-/**
- * Leaves a critical section entered with PDMCritSectEnter().
+#endif
+
+
+/**
+ * Enters a PDM critical section.
  *
  * @returns VINF_SUCCESS if entered successfully.
@@ -96 +96 @@
 #endif
 }
+
+
+#ifdef IN_RING3
+/**
+ * Enters a PDM critical section.
+ *
+ * @returns VINF_SUCCESS if entered successfully.
+ * @returns rcBusy when encountering a busy critical section in GC/R0.
+ * @returns VERR_SEM_DESTROYED if the critical section is dead.
+ *
+ * @param   pCritSect           The PDM critical section to enter.
+ * @param   fCallHost           Whether this is a VMMGCCallHost() or VMMR0CallHost() request.
+ */
+PDMR3DECL(int) PDMR3CritSectEnterEx(PPDMCRITSECT pCritSect, bool fCallHost)
+{
+    int rc = PDMCritSectEnter(pCritSect, VERR_INTERNAL_ERROR);
+    if (    rc == VINF_SUCCESS
+        &&  fCallHost
+        &&  pCritSect->s.Core.Strict.ThreadOwner != NIL_RTTHREAD)
+    {
+        RTThreadWriteLockDec(pCritSect->s.Core.Strict.ThreadOwner);
+        ASMAtomicUoWriteSize(&pCritSect->s.Core.Strict.ThreadOwner, NIL_RTTHREAD);
+    }
+    return rc;
+}
+#endif /* IN_RING3 */