Changeset 5254

Timestamp:

10/12/07 02:46:15 (1 year ago)

Author:

vboxsync

Message:

Reset ring-0 stats too (untested).

Files:

• trunk/src/VBox/VMM/STAM.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/STAM.cpp

@@ -86 +86 @@
- * Init record for a ring-0 statistic sample.
- */
-INIT
+
-{
-    /** The VM structure offset of the variable. */
@@ -98 +98 @@
-    /** The description. */
-    const char     *pszDesc;
-INIT
+
-
-
@@ -114 +114 @@
-static int stamR3PrintOne(PSTAMDESC pDesc, void *pvArg);
-static int stamR3EnumOne(PSTAMDESC pDesc, void *pvArg);
+static bool stamR3MultiMatch(const char * const *papszExpressions, unsigned cExpressions, unsigned *piExpression, const char *pszName);
+static char **stamR3SplitPattern(const char *pszPat, unsigned *pcExpressions, char **ppszCopy);
-static int stamR3Enum(PVM pVM, const char *pszPat, bool fUpdateRing0, int (pfnCallback)(PSTAMDESC pDesc, void *pvArg), void *pvArg);
-static void stamR3Ring0StatsRegister(PVM pVM);
@@ -148 +150 @@
-
-/**
-init
-
-INIT
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+mapping
+
+
+
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+_RESET
+
+      
-};
-
@@ -464 +466 @@
-     */
-    int rc;
-in
-in
+size_
+size_
-    PSTAMDESC pNew = (PSTAMDESC)RTMemAlloc(sizeof(*pNew) + cchName + cchDesc);
-    if (pNew)
@@ -556 +558 @@
- * @param   pszPat      The name matching pattern. See somewhere_where_this_is_described_in_detail.
- *                      If NULL all samples are reset.
+ * @remarks Don't confuse this with the other 'XYZR3Reset' methods, it's not called at VM reset.
- */
-STAMR3DECL(int)  STAMR3Reset(PVM pVM, const char *pszPat)
-{
+    int rc = VINF_SUCCESS;
+
+    /* ring-0 */
+    GVMMRESETSTATISTICSSREQ GVMMReq;
+    //GMMRESETSTATISTICSSREQ GMMReq;
+    bool fGVMMMatched = !pszPat || !*pszPat;
+    //bool fGMMMatched = fGVMMMatched;
+    if (fGVMMMatched)
+        memset(&GVMMReq.Stats, 0xff, sizeof(GVMMReq.Stats));
+    else
+    {
+        char *pszCopy;
+        unsigned cExpressions;
+        char **papszExpressions = stamR3SplitPattern(pszPat, &cExpressions, &pszCopy);
+        if (!papszExpressions)
+            return VERR_NO_MEMORY;
+
+        /* GVMM */
+        memset(&GVMMReq.Stats, 0, sizeof(GVMMReq.Stats));
+        for (unsigned i = 0; i < RT_ELEMENTS(g_aGVMMStats); i++)
+            if (stamR3MultiMatch(papszExpressions, cExpressions, NULL, g_aGVMMStats[i].pszName))
+            {
+                *((uint8_t *)&GVMMReq.Stats + (g_aGVMMStats[i].offVar - RT_UOFFSETOF(VM, stam.s.GVMMStats))) = 0xff;
+                fGVMMMatched = true;
+            }
+
+        /* GMM */
+//        memset(&GMMReq.Stats, 0, sizeof(GMMReq.Stats));
+//        for (unsigned i = 0; i < RT_ELEMENTS(g_aGMMStats); i++)
+//            if (stamR3MultiMatch(papszExpressions, cExpressions, NULL, g_aGMMStats[i].pszName))
+//            {
+//                 *((uint8_t *)&GMMReq.Stats + (g_aGMMStats[i].offVar - RT_UOFFSETOF(VM, stam.s.GMMStats))) = 0xff;
+//                 fGMMMatched = true;
+//            }
+
+        RTMemTmpFree(papszExpressions);
+        RTStrFree(pszCopy);
+    }
+
-    STAM_LOCK_WR(pVM);
+    if (fGVMMMatched)
+    {
+        GVMMReq.Hdr.cbReq = sizeof(GVMMReq);
+        GVMMReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+        GVMMReq.pSession = pVM->pSession;
+        rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GVMM_RESET_STATISTICS, 0, &GVMMReq.Hdr);
+    }
+
+//    if (fGMMMatched)
+//    {
+//        GMMReq.Hdr.cbReq = sizeof(Req);
+//        GMMReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+//        GMMReq.pSession = pVM->pSession;
+//        rc = SUPCallVMMR0Ex(pVM->pVMR0, VMMR0_DO_GMM_RESET_STATISTICS, 0, &Req.Hdr);
+//    }
+
+    /* and the reset */
-    stamR3Enum(pVM, pszPat, false /* fUpdateRing0 */, stamR3ResetOne, pVM);
+
-    STAM_UNLOCK_WR(pVM);
-VINF_SUCCESS
+rc
-}
-
@@ -1276 +1336 @@
-
-
+/**
+ * Splits a multi pattern into single ones.
+ *
+ * @returns Pointer to an array of single patterns. Free it with RTMemTmpFree.
+ * @param   pszPat          The pattern to split.
+ * @param   pcExpressions   The number of array elements.
+ * @param   pszCopy         The pattern copy to free using RTStrFree.
+ */
+static char **stamR3SplitPattern(const char *pszPat, unsigned *pcExpressions, char **ppszCopy)
+{
+    Assert(pszPat && *pszPat);
+
+    char *pszCopy = RTStrDup(pszPat);
+    if (!pszCopy)
+        return NULL;
+
+    /* count them & allocate array. */
+    char *psz = pszCopy;
+    unsigned cExpressions = 1;
+    while ((psz = strchr(psz, '|')) != NULL)
+        cExpressions++, psz++;
+
+    char **papszExpressions = (char **)RTMemTmpAllocZ((cExpressions + 1) * sizeof(char *));
+    if (!papszExpressions)
+    {
+        RTStrFree(pszCopy);
+        return NULL;
+    }
+
+    /* split */
+    psz = pszCopy;
+    for (unsigned i = 0;;)
+    {
+        papszExpressions[i] = psz;
+        if (++i >= cExpressions)
+            break;
+        psz = strchr(psz, '|');
+        *psz++ = '\0';
+    }
+
+    /* sort the array, putting '*' last. */
+    /** @todo sort it... */
+
+    *pcExpressions = cExpressions;
+    *ppszCopy = pszCopy;
+    return papszExpressions;
+}
+
-
-/**
@@ -1341 +1449 @@
-         * Split up the pattern first.
-         */
-
-
+
+
+
+
-            return VERR_NO_MEMORY;
-
-        /* count them & allocate array. */
-        char *psz = pszCopy;
-        unsigned cExpressions = 1;
-        while ((psz = strchr(psz, '|')) != NULL)
-            cExpressions++, psz++;
-
-        char **papszExpressions = (char **)RTMemTmpAlloc((cExpressions + 1) * sizeof(char *));
-        if (!papszExpressions)
-        {
-            RTStrFree(pszCopy);
-            return VERR_NO_TMP_MEMORY;
-        }
-
-        /* split */
-        psz = pszCopy;
-        for (unsigned i = 0;;)
-        {
-            papszExpressions[i] = psz;
-            if (++i >= cExpressions)
-                break;
-            psz = strchr(psz, '|');
-            *psz++ = '\0';
-        }
-
-        /* sort the array, putting '*' last. */
-        /** @todo sort it... */
-
-        /*