Changeset 26122 in vbox

Timestamp:

Feb 1, 2010 2:23:08 PM (15 years ago)

Author:

vboxsync

Message:

Main/Performance: Use iprt::MiniString instead of std::string.

Location:

trunk/src/VBox/Main

Files:

• Performance.cpp (modified) (2 diffs)
• include/Performance.h (modified) (6 diffs)

trunk/src/VBox/Main/Performance.cpp

@@ -505 +505 @@
 
     for (size_t pos = name.find(",");
-         pos != std::string::npos;
+         pos != com::Utf8Str::npos;
          pos = name.find(",", startPos))
     {
-        mElements.push_back(std::make_pair(object, std::string(name.substr(startPos, pos - startPos).c_str())));
+        mElements.push_back(std::make_pair(object, iprt::MiniString(name.substr(startPos, pos - startPos).c_str())));
         startPos = pos + 1;
     }
-    mElements.push_back(std::make_pair(object, std::string(name.substr(startPos).c_str())));
+    mElements.push_back(std::make_pair(object, iprt::MiniString(name.substr(startPos).c_str())));
 }
 
@@ -587 +587 @@
 }
 
-bool Filter::match(const ComPtr<IUnknown> object, const std::string &name) const
+bool Filter::match(const ComPtr<IUnknown> object, const iprt::MiniString &name) const
 {
     ElementList::const_iterator it;

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

@@ -25 +25 @@
 #include <VBox/com/defs.h>
 #include <VBox/com/ptr.h>
+#include <VBox/com/string.h>
 
 #include <iprt/types.h>
 #include <iprt/err.h>
 
-#include <algorithm>
 #include <list>
-#include <string>
 #include <vector>
-
-namespace com
-{
-    class Utf8Str;
-}
 
 namespace pm
@@ -84 +78 @@
     typedef int HintFlags;
     typedef std::pair<RTPROCESS, HintFlags> ProcessFlagsPair;
-
-    inline bool processEqual(ProcessFlagsPair pair, RTPROCESS process)
-    {
-        return pair.first == process;
-    }
 
     class CollectorHints
@@ -130 +119 @@
         {
             ProcessList::iterator it;
-
-            it = std::find_if(mProcesses.begin(),
-                              mProcesses.end(),
-                              std::bind2nd(std::ptr_fun(processEqual), process));
-
-            if (it != mProcesses.end())
-                return *it;
+            for (it = mProcesses.begin(); it != mProcesses.end(); it++)
+                if (it->first == process)
+                    return *it;
 
             /* Not found -- add new */
@@ -369 +354 @@
             if (mAggregate)
             {
-                mName += ":";
-                mName += mAggregate->getName();
+                mName.append(":");
+                mName.append(mAggregate->getName());
             }
         }
@@ -394 +379 @@
 
     private:
-        std::string mName;
+        iprt::MiniString mName;
         BaseMetric *mBaseMetric;
         SubMetric  *mSubMetric;
@@ -409 +394 @@
         static bool patternMatch(const char *pszPat, const char *pszName,
                                  bool fSeenColon = false);
-        bool match(const ComPtr<IUnknown> object, const std::string &name) const;
+        bool match(const ComPtr<IUnknown> object, const iprt::MiniString &name) const;
     private:
         void init(ComSafeArrayIn(IN_BSTR, metricNames),
                   ComSafeArrayIn(IUnknown * , objects));
 
-        typedef std::pair<const ComPtr<IUnknown>, const std::string> FilterElement;
+        typedef std::pair<const ComPtr<IUnknown>, const iprt::MiniString> FilterElement;
         typedef std::list<FilterElement> ElementList;