Changeset 37467 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Jun 15, 2011 1:08:45 PM (13 years ago)

Author:

vboxsync

Message:

IOM: Clean up locking now that all devices has its own CS.

Location:

trunk/src/VBox/VMM/include

Files:

• IOMInline.h (modified) (7 diffs)
• IOMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/include/IOMInline.h

@@ -35 +35 @@
 DECLINLINE(CTX_SUFF(PIOMIOPORTRANGE)) iomIOPortGetRange(PVM pVM, RTIOPORT Port)
 {
-    Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock) || !PDMCritSectIsInitialized(&pVM->iom.s.EmtLock));
+    Assert(PDMCritSectIsOwner(&pVM->iom.s.CritSect));
     return (CTX_SUFF(PIOMIOPORTRANGE))RTAvlroIOPortRangeGet(&pVM->iom.s.CTX_SUFF(pTrees)->CTX_SUFF(IOPortTree), Port);
 }
@@ -51 +51 @@
 DECLINLINE(PIOMIOPORTRANGER3) iomIOPortGetRangeR3(PVM pVM, RTIOPORT Port)
 {
-    Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock) || !PDMCritSectIsInitialized(&pVM->iom.s.EmtLock));
+    Assert(PDMCritSectIsOwner(&pVM->iom.s.CritSect));
     return (PIOMIOPORTRANGER3)RTAvlroIOPortRangeGet(&pVM->iom.s.CTX_SUFF(pTrees)->IOPortTreeR3, Port);
 }
@@ -67 +67 @@
 DECLINLINE(PIOMMMIORANGE) iomMmioGetRange(PVM pVM, RTGCPHYS GCPhys)
 {
-    Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock));
+    Assert(PDMCritSectIsOwner(&pVM->iom.s.CritSect));
     PIOMMMIORANGE pRange = pVM->iom.s.CTX_SUFF(pMMIORangeLast);
     if (    !pRange
@@ -101 +101 @@
 DECLINLINE(PIOMMMIORANGE) iomMmioGetRangeWithRef(PVM pVM, RTGCPHYS GCPhys)
 {
-    int rc = PDMCritSectEnter(&pVM->iom.s.EmtLock, VINF_SUCCESS);
+    int rc = PDMCritSectEnter(&pVM->iom.s.CritSect, VINF_SUCCESS);
     AssertRCReturn(rc, NULL);
 
@@ -112 +112 @@
         iomMmioRetainRange(pRange);
 
-    PDMCritSectLeave(&pVM->iom.s.EmtLock);
+    PDMCritSectLeave(&pVM->iom.s.CritSect);
     return pRange;
 }
@@ -169 +169 @@
 DECLINLINE(PIOMMMIOSTATS) iomMmioGetStats(PVM pVM, RTGCPHYS GCPhys, PIOMMMIORANGE pRange)
 {
-    PDMCritSectEnter(&pVM->iom.s.EmtLock, VINF_SUCCESS);
+    PDMCritSectEnter(&pVM->iom.s.CritSect, VINF_SUCCESS);
 
     /* For large ranges, we'll put everything on the first byte. */
@@ -186 +186 @@
     }
 
-    PDMCritSectLeave(&pVM->iom.s.EmtLock);
+    PDMCritSectLeave(&pVM->iom.s.CritSect);
     return pStats;
 }

trunk/src/VBox/VMM/include/IOMInternal.h

@@ -323 +323 @@
 
     /** Lock serializing EMT access to IOM. */
-    PDMCRITSECT                     EmtLock;
+    PDMCRITSECT                     CritSect;
 
     /** @name Caching of I/O Port and MMIO ranges and statistics.
@@ -433 +433 @@
 
 /* IOM locking helpers. */
-int     iomLock(PVM pVM);
-int     iomTryLock(PVM pVM);
-void    iomUnlock(PVM pVM);
+#define IOM_LOCK(a_pVM)     PDMCritSectEnter(&(a_pVM)->iom.s.CritSect, VERR_SEM_BUSY)
+#define IOM_UNLOCK(a_pVM)   do { PDMCritSectLeave(&(a_pVM)->iom.s.CritSect); } while (0)
+
 
 /* Disassembly helpers used in IOMAll.cpp & IOMAllMMIO.cpp */