Changeset 18532 in vbox for trunk/src

Timestamp:

Mar 30, 2009 12:01:20 PM (16 years ago)

Author:

vboxsync

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

45397

Message:

PDMCritSect: Increased the padding size on 32-bit (+32 bytes) for saving the name. Added PDMR3CritSectCountOwned(). Promoted three of the stats to release stats.

Location:

trunk/src/VBox/VMM

Files:

• PDMCritSect.cpp (modified) (6 diffs)
• VMMAll/PDMAllCritSect.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -35 +35 @@
 #include <iprt/assert.h>
 #include <iprt/thread.h>
+#include <iprt/string.h>
 
 
@@ -114 +115 @@
     if (RT_SUCCESS(rc))
     {
-        pCritSect->pVMR3 = pVM;
-        pCritSect->pVMR0 = pVM->pVMR0;
-        pCritSect->pVMRC = pVM->pVMRC;
-        pCritSect->pvKey = pvKey;
+        pCritSect->pVMR3         = pVM;
+        pCritSect->pVMR0         = pVM->pVMR0;
+        pCritSect->pVMRC         = pVM->pVMRC;
+        pCritSect->pvKey         = pvKey;
         pCritSect->EventToSignal = NIL_RTSEMEVENT;
-        pCritSect->pNext = pVM->pdm.s.pCritSects;
+        pCritSect->pNext         = pVM->pdm.s.pCritSects;
+        pCritSect->pszName       = RTStrDup(pszName);
         pVM->pdm.s.pCritSects = pCritSect;
-#ifdef VBOX_WITH_STATISTICS
         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);
+#ifdef VBOX_WITH_STATISTICS
         STAMR3RegisterF(pVM, &pCritSect->StatLocked,        STAMTYPE_PROFILE_ADV, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_OCCURENCE, NULL, "/PDM/CritSects/%s/Locked", pszName);
 #endif
@@ -189 +191 @@
 
     /* delete */
-    pCritSect->pNext = NULL;
-    pCritSect->pvKey = NULL;
-    pCritSect->pVMR3 = NULL;
-    pCritSect->pVMR0 = NIL_RTR0PTR;
-    pCritSect->pVMRC = NIL_RTRCPTR;
-#ifdef VBOX_WITH_STATISTICS
+    pCritSect->pNext   = NULL;
+    pCritSect->pvKey   = NULL;
+    pCritSect->pVMR3   = NULL;
+    pCritSect->pVMR0   = NIL_RTR0PTR;
+    pCritSect->pVMRC   = NIL_RTRCPTR;
+    RTStrFree((char *)pCritSect->pszName);
+    pCritSect->pszName = NULL;
     if (!fFinal)
     {
@@ -200 +203 @@
         STAMR3Deregister(pVM, &pCritSect->StatContentionRZUnlock);
         STAMR3Deregister(pVM, &pCritSect->StatContentionR3);
+#ifdef VBOX_WITH_STATISTICS
         STAMR3Deregister(pVM, &pCritSect->StatLocked);
-    }
 #endif
+    }
     return RTCritSectDelete(&pCritSect->Core);
 }
@@ -334 +338 @@
  * @returns VERR_SEM_DESTROYED if RTCritSectDelete was called while waiting.
  * @param   pCritSect       The critical section.
- * @param   EventToSignal     The semapore that should be signalled.
+ * @param   EventToSignal   The semapore that should be signalled.
  */
 VMMR3DECL(int) PDMR3CritSectScheduleExitEvent(PPDMCRITSECT pCritSect, RTSEMEVENT EventToSignal)
@@ -350 +354 @@
 }
 
+
+/**
+ * Counts the critical sections owned by the calling thread, optionally
+ * returning a comma separated list naming them.
+ *
+ * This is for diagnostic purposes only.
+ *
+ * @returns Lock count.
+ *
+ * @param   pVM             The VM handle.
+ * @param   pszNames        Where to return the critical section names.
+ * @param   cbNames         The size of the buffer.
+ */
+VMMR3DECL(uint32_t) PDMR3CritSectCountOwned(PVM pVM, char *pszNames, size_t cbNames)
+{
+    /*
+     * Init the name buffer.
+     */
+    size_t cchLeft = cbNames;
+    if (cchLeft)
+    {
+        cchLeft--;
+        pszNames[0] = pszNames[cchLeft] = '\0';
+    }
+
+    /*
+     * Iterate the critical sections.
+     */
+    /* This is unsafe, but wtf. */
+    RTNATIVETHREAD const    hNativeThread = RTThreadNativeSelf();
+    uint32_t                cCritSects = 0;
+    for (PPDMCRITSECTINT pCur = pVM->pdm.s.pCritSects;
+         pCur;
+         pCur = pCur->pNext)
+    {
+        /* Same as RTCritSectIsOwner(). */
+        if (pCur->Core.NativeThreadOwner == hNativeThread)
+        {
+            cCritSects++;
+
+            /*
+             * Copy the name if there is space. Fun stuff.
+             */
+            if (cchLeft)
+            {
+                /* try add comma. */
+                if (cCritSects != 1)
+                {
+                    *pszNames++ = ',';
+                    if (--cchLeft)
+                    {
+                        *pszNames++ = ' ';
+                        cchLeft--;
+                    }
+                }
+
+                /* try copy the name. */
+                if (cchLeft)
+                {
+                    size_t const cchName = strlen(pCur->pszName);
+                    if (cchName < cchLeft)
+                    {
+                        memcpy(pszNames, pCur->pszName, cchName);
+                        pszNames += cchName;
+                        cchLeft -= cchName;
+                    }
+                    else
+                    {
+                        if (cchLeft > 2)
+                        {
+                            memcpy(pszNames, pCur->pszName, cchLeft - 2);
+                            pszNames += cchLeft - 2;
+                            cchLeft = 2;
+                        }
+                        while (cchLeft-- > 0)
+                            *pszNames++ = '+';
+                    }
+                }
+                *pszNames = '\0';
+            }
+        }
+    }
+
+    return cCritSects;
+}

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

@@ -57 +57 @@
     NOREF(rcBusy);
 
-    STAM_STATS({ if (pCritSect->s.Core.cLockers >= 0 && !RTCritSectIsOwner(&pCritSect->s.Core)) STAM_COUNTER_INC(&pCritSect->s.StatContentionR3); });
+    STAM_REL_STATS({if (pCritSect->s.Core.cLockers >= 0 && !RTCritSectIsOwner(&pCritSect->s.Core))
+                        STAM_COUNTER_INC(&pCritSect->s.StatContentionR3); });
     int rc = RTCritSectEnter(&pCritSect->s.Core);
     STAM_STATS({ if (pCritSect->s.Core.cNestings == 1) STAM_PROFILE_ADV_START(&pCritSect->s.StatLocked, l); });
@@ -95 +96 @@
      */
     LogFlow(("PDMCritSectEnter: locked => R3 (%Rrc)\n", rcBusy));
-    STAM_COUNTER_INC(&pCritSect->s.StatContentionRZLock);
+    STAM_REL_COUNTER_INC(&pCritSect->s.StatContentionRZLock);
     return rcBusy;
 #endif /* !IN_RING3 */
@@ -203 +204 @@
     VM_FF_SET(pVM, VM_FF_PDM_CRITSECT);
     VM_FF_SET(pVM, VM_FF_TO_R3);
-    STAM_COUNTER_INC(&pVM->pdm.s.StatQueuedCritSectLeaves);
-    STAM_COUNTER_INC(&pCritSect->s.StatContentionRZUnlock);
+    STAM_REL_COUNTER_INC(&pVM->pdm.s.StatQueuedCritSectLeaves);
+    STAM_REL_COUNTER_INC(&pCritSect->s.StatContentionRZUnlock);
 #endif /* !IN_RING3 */
 }