Changeset 32760 in webkit for trunk/JavaScriptCore/wtf/HashCountedSet.h

Timestamp:

May 1, 2008, 9:32:32 AM (17 years ago)

Author:

[email protected]

Message:

2008-05-01 Kevin McCullough <​[email protected]>

Reviewed by Darin.

<rdar://problem/5770054> JavaScript profiler (10928)

• Fix "sample" output so that it can be imported into Instruments
• Also keep track of number of times a function is profiled.

• JavaScriptCore.xcodeproj/project.pbxproj: Add StrHash.h which needed to be pulled out of identifier.cpp so that it could be used by the profiler and identifiers.
• kjs/identifier.cpp: Ditto.
• profiler/FunctionCallProfile.cpp: (KJS::FunctionCallProfile::printDataInspectorStyle): Inspector style printing should show microseconds. (KJS::FunctionCallProfile::printDataSampleStyle): Sample style printing now counts the number of times a function is in the stack tree and does not print microseconds since that does not make sense for a sampler.
• profiler/FunctionCallProfile.h: Keep track of number of times a function is profiled. (KJS::FunctionCallProfile::numberOfCalls):
• profiler/Profiler.cpp: (KJS::functionNameCountPairComparator): Comparator for sort function in printDataSampleStyle. (KJS::Profiler::printDataSampleStyle): Print the number of times that a function is listed in the stack tree in order of most times listed.
• wtf/HashCountedSet.h: Added copyToVector since it didn't exist and is a more standard way to copy a HashSet to a Vector. I added on variant that takes a pair as the Vector's type and so the HashCountedSet simply fills in that pair with its internal pair, and another variant that takes a Vector of the type of the HashCountedSet and only fills in the Vector with the first element of the pair. (WTF::copyToVector):
• wtf/StrHash.h: Added. (WTF::):

File:

• trunk/JavaScriptCore/wtf/HashCountedSet.h (modified) (2 diffs)

trunk/JavaScriptCore/wtf/HashCountedSet.h

@@ -26 +26 @@
 #include "Assertions.h"
 #include "HashMap.h"
+#include "Vector.h"
 
 namespace WTF {
@@ -171 +172 @@
         m_impl.clear(); 
     }
+    
+    template<typename Value, typename HashFunctions, typename Traits, typename VectorType>
+    inline void copyToVector(const HashCountedSet<Value, HashFunctions, Traits>& collection, VectorType& vector)
+    {
+        typedef typename HashCountedSet<Value, HashFunctions, Traits>::const_iterator iterator;
+        
+        vector.resize(collection.size());
+        
+        iterator it = collection.begin();
+        iterator end = collection.end();
+        for (unsigned i = 0; it != end; ++it, ++i)
+            vector[i] = *it;
+    }
+
+    template<typename Value, typename HashFunctions, typename Traits>
+    inline void copyToVector(const HashCountedSet<Value, HashFunctions, Traits>& collection, Vector<Value>& vector)
+    {
+        typedef typename HashCountedSet<Value, HashFunctions, Traits>::const_iterator iterator;
+        
+        vector.resize(collection.size());
+        
+        iterator it = collection.begin();
+        iterator end = collection.end();
+        for (unsigned i = 0; it != end; ++it, ++i)
+            vector[i] = (*it).first;
+    }
+
 
 } // namespace khtml