Changeset 5207 in vbox

Timestamp:

Oct 9, 2007 2:40:45 PM (18 years ago)

Author:

vboxsync

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

25134

Message:

Added support for multi pattern expressions (not optimized).

File:

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

trunk/src/VBox/VMM/STAM.cpp

@@ -613 +613 @@
     stamR3SnapshotPrintf(&State, "<Statistics>\n");
     STAM_LOCK_RD(pVM);
-    stamR3Enum(pVM, pszPat, stamR3SnapshotOne, &State);
+    int rc = stamR3Enum(pVM, pszPat, stamR3SnapshotOne, &State);
     STAM_UNLOCK_RD(pVM);
     stamR3SnapshotPrintf(&State, "</Statistics>\n");
+
+    if (VBOX_SUCCESS(rc))
+        rc = State.rc;
+    else
+    {
+        RTMemFree(State.pszStart);
+        State.pszStart = State.pszEnd = State.psz = NULL;
+        State.cbAllocated = 0;
+    }
 
     /*
@@ -623 +632 @@
     if (pcchSnapshot)
         *pcchSnapshot = State.psz - State.pszStart;
-    return State.rc;
+    return rc;
 }
 
@@ -1134 +1143 @@
  * @param   pszName     Name to match against the pattern.
  */
-static bool stamr3Match(const char *pszPat, const char *pszName)
-{
-    if (!pszPat)
-        return true;
-
+static bool stamR3Match(const char *pszPat, const char *pszName)
+{
     /* ASSUMES ASCII */
     for (;;)
@@ -1158 +1164 @@
                     if (    ch == chPat
                         &&  (   !chPat
-                             || stamr3Match(pszPat + 1, pszName)))
+                             || stamR3Match(pszPat + 1, pszName)))
                         return true;
                     if (!ch)
@@ -1185 +1191 @@
 
 /**
+ * Match a name against an array of patterns.
+ *
+ * @returns true if it matches, false if it doesn't match.
+ * @param   papszExpressions    The array of pattern expressions.
+ * @param   cExpressions        The number of array entries.
+ * @param   piExpression        Where to read/store the current skip index.
+ *                              This is for future use.
+ * @param   pszName             The name to match.
+ */
+static bool stamR3MultiMatch(const char * const *papszExpressions, unsigned cExpressions,
+                             unsigned *piExpression, const char *pszName)
+{
+    for (unsigned i = *piExpression; i < cExpressions; i++)
+    {
+        const char *pszPat = papszExpressions[i];
+        if (stamR3Match(pszPat, pszName))
+        {
+            /* later:
+            if (i > *piExpression)
+            {
+                check if we can skip some expressions
+            }*/
+            return true;
+        }
+    }
+    return false;
+}
+
+
+
+/**
  * Enumerates the nodes selected by a pattern or all nodes if no pattern
  * is specified.
@@ -1200 +1237 @@
 static int stamR3Enum(PVM pVM, const char *pszPat, int (*pfnCallback)(PSTAMDESC pDesc, void *pvArg), void *pvArg)
 {
-    /*
-     * Search for it.
-     */
-    int         rc = VINF_SUCCESS;
-    PSTAMDESC   pCur = pVM->stam.s.pHead;
-    while (pCur)
-    {
-        if (stamr3Match(pszPat, pCur->pszName))
+    int rc = VINF_SUCCESS;
+
+    /*
+     * All
+     */
+    if (!pszPat || !*pszPat || !strcmp(pszPat, "*"))
+    {
+        PSTAMDESC   pCur = pVM->stam.s.pHead;
+        while (pCur)
         {
             rc = pfnCallback(pCur, pvArg);
             if (rc)
                 break;
+
+            /* next */
+            pCur = pCur->pNext;
         }
-
-        /* next */
-        pCur = pCur->pNext;
+    }
+
+    /*
+     * Single expression pattern.
+     */
+    else if (!strchr(pszPat, '|'))
+    {
+        for (PSTAMDESC pCur = pVM->stam.s.pHead; pCur; pCur = pCur->pNext)
+            if (stamR3Match(pszPat, pCur->pszName))
+            {
+                rc = pfnCallback(pCur, pvArg);
+                if (rc)
+                    break;
+            }
+    }
+
+    /*
+     * Multi expression pattern.
+     */
+    else
+    {
+        /*
+         * Split up the pattern first.
+         */
+        char *pszCopy = RTStrDup(pszPat);
+        if (!pszCopy)
+            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... */
+
+        /*
+         * Perform the enumeration.
+         */
+        unsigned iExpression = 0;
+        for (PSTAMDESC pCur = pVM->stam.s.pHead; pCur; pCur = pCur->pNext)
+            if (stamR3MultiMatch(papszExpressions, cExpressions, &iExpression, pCur->pszName))
+            {
+                rc = pfnCallback(pCur, pvArg);
+                if (rc)
+                    break;
+            }
+
+        RTMemTmpFree(papszExpressions);
+        RTStrFree(pszCopy);
     }