Changeset 12678 in vbox for trunk/src

Timestamp:

Sep 24, 2008 7:28:21 AM (16 years ago)

Author:

vboxsync

Message:

PerfAPI: Handling of trailing colon in filter patterns

Location:

trunk/src/VBox/Main

Files:

• Performance.cpp (modified) (4 diffs)
• darwin/PerformanceDarwin.cpp (modified) (1 diff)
• include/Performance.h (modified) (1 diff)

trunk/src/VBox/Main/Performance.cpp

@@ -463 +463 @@
 }
 
-/* The following method was borrowed from VMM/STAM.cpp */
-bool Filter::patternMatch(const char *pszPat, const char *pszName)
-{
+/* The following method was borrowed from VMM/STAM.cpp and modified to handle
+ * the special case of trailing colon in the pattern.
+ */
+bool Filter::patternMatch(const char *pszPat, const char *pszName,
+                          bool fSeenColon)
+{
+    bool seenColon = fSeenColon;
     /* ASSUMES ASCII */
     for (;;)
@@ -473 +477 @@
         {
             default:
+                /* Handle a special case, the mask terminating with a colon */
+                if (chPat == ':')
+                {
+                    if (!seenColon && !*(pszPat + 1))
+                        return !*pszName;
+                    seenColon = true;
+                }
                 if (*pszName != chPat)
                     return false;
@@ -482 +493 @@
                     /* nothing */;
 
+                /* Handle a special case, the mask terminating with a colon */
+                if (chPat == ':')
+                {
+                    if (!seenColon && !*(pszPat + 1))
+                        return !strchr(pszName, ':');
+                    seenColon = true;
+                }
                 for (;;)
                 {
@@ -487 +505 @@
                     if (    ch == chPat
                         &&  (   !chPat
-                             || patternMatch(pszPat + 1, pszName)))
+                             || patternMatch(pszPat + 1, pszName, seenColon)))
                         return true;
                     if (!ch)

trunk/src/VBox/Main/darwin/PerformanceDarwin.cpp

@@ -149 +149 @@
         return RTErrConvertFromDarwin(rc);
     }
-    else if (nb < sizeof(*tinfo))
+    else if ((unsigned int)nb < sizeof(*tinfo))
     {
         Log(("proc_pidinfo() -> too few bytes %d", nb));

trunk/src/VBox/Main/include/Performance.h

@@ -376 +376 @@
         Filter(ComSafeArrayIn(INPTR BSTR, metricNames),
                ComSafeArrayIn(IUnknown * , objects));
-        static bool patternMatch(const char *pszPat, const char *pszName);
+        static bool patternMatch(const char *pszPat, const char *pszName,
+                                 bool fSeenColon = false);
         bool match(const ComPtr<IUnknown> object, const std::string &name) const;
     private: