Changeset 12983 in vbox for trunk/src/VBox/VMM/PDMCritSect.cpp

Timestamp:

Oct 4, 2008 10:17:38 PM (17 years ago)

Author:

vboxsync

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

37416

Message:

#1865: PDMCritSect.

File:

• trunk/src/VBox/VMM/PDMCritSect.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * PDM Critical Sections
+ * PDM - Critical Sections, Ring-3.
  */
 
@@ -19 +19 @@
  * additional information or have any questions.
  */
-
 
 
@@ -71 +70 @@
          pCur;
          pCur = pCur->pNext)
-        pCur->pVMGC = pVM->pVMGC;
+        pCur->pVMRC = pVM->pVMRC;
 }
 
@@ -117 +116 @@
         pCritSect->pVMR3 = pVM;
         pCritSect->pVMR0 = (RTR0PTR)pVM;//pVM->pVMR0;
-        pCritSect->pVMGC = pVM->pVMGC;
+        pCritSect->pVMRC = pVM->pVMRC;
         pCritSect->pvKey = pvKey;
         pCritSect->EventToSignal = NIL_RTSEMEVENT;
@@ -123 +122 @@
         pVM->pdm.s.pCritSects = pCritSect;
 #ifdef VBOX_WITH_STATISTICS
-        STAMR3RegisterF(pVM, &pCritSect->StatContentionR0GCLock,   STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR0GCLock", pszName);
-        STAMR3RegisterF(pVM, &pCritSect->StatContentionR0GCUnlock, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR0GCUnlock", pszName);
-        STAMR3RegisterF(pVM, &pCritSect->StatContentionR3,         STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR3", pszName);
-        STAMR3RegisterF(pVM, &pCritSect->StatLocked,           STAMTYPE_PROFILE_ADV, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_OCCURENCE, NULL, "/PDM/CritSects/%s/Locked", pszName);
+        STAMR3RegisterF(pVM, &pCritSect->StatContentionRZLock,  STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZLock", pszName);
+        STAMR3RegisterF(pVM, &pCritSect->StatContentionRZUnlock,STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZUnlock", pszName);
+        STAMR3RegisterF(pVM, &pCritSect->StatContentionR3,      STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionR3", pszName);
+        STAMR3RegisterF(pVM, &pCritSect->StatLocked,        STAMTYPE_PROFILE_ADV, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_OCCURENCE, NULL, "/PDM/CritSects/%s/Locked", pszName);
 #endif
     }
@@ -191 +190 @@
     /* delete */
     pCritSect->pNext = NULL;
-    pCritSect->pVMGC = 0;
+    pCritSect->pvKey = NULL;
     pCritSect->pVMR3 = NULL;
     pCritSect->pVMR0 = NIL_RTR0PTR;
-    pCritSect->pvKey = NULL;
+    pCritSect->pVMRC = NIL_RTRCPTR;
 #ifdef VBOX_WITH_STATISTICS
     if (!fFinal)
     {
-        STAMR3Deregister(pVM, &pCritSect->StatContentionR0GCLock);
-        STAMR3Deregister(pVM, &pCritSect->StatContentionR0GCUnlock);
+        STAMR3Deregister(pVM, &pCritSect->StatContentionRZLock);
+        STAMR3Deregister(pVM, &pCritSect->StatContentionRZUnlock);
         STAMR3Deregister(pVM, &pCritSect->StatContentionR3);
         STAMR3Deregister(pVM, &pCritSect->StatLocked);