Changeset 21175 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 2, 2009 3:59:21 PM (16 years ago)

Author:

vboxsync

Message:

Don't release the PGM lock when calling the PGM pool handler. (pointless as we'll request the lock again immediately)

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -435 +435 @@
                             if (pCur->CTX_SUFF(pfnHandler))
                             {
+                                PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
 #  ifdef IN_RING0
                                 PFNPGMR0PHYSHANDLER pfnHandler = pCur->CTX_SUFF(pfnHandler);
@@ -440 +441 @@
                                 PFNPGMRCPHYSHANDLER pfnHandler = pCur->CTX_SUFF(pfnHandler);
 #  endif
+                                bool  fLeaveLock = (pfnHandler != pPool->CTX_SUFF(pfnAccessHandler));
                                 void *pvUser = pCur->CTX_SUFF(pvUser);
 
                                 STAM_PROFILE_START(&pCur->Stat, h);
-                                pgmUnlock(pVM); /* @todo: Not entirely safe. */
+                                if (fLeaveLock)
+                                    pgmUnlock(pVM); /* @todo: Not entirely safe. */
+
                                 rc = pfnHandler(pVM, uErr, pRegFrame, pvFault, GCPhysFault, pvUser);
-                                pgmLock(pVM);
+                                if (fLeaveLock)
+                                    pgmLock(pVM);
 #  ifdef VBOX_WITH_STATISTICS
                                 pCur = (PPGMPHYSHANDLER)RTAvlroGCPhysRangeGet(&pVM->pgm.s.CTX_SUFF(pTrees)->PhysHandlers, GCPhysFault);