Changeset 32760 in webkit for trunk/JavaScriptCore/profiler/FunctionCallProfile.cpp

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/profiler/FunctionCallProfile.cpp (modified) (2 diffs)

trunk/JavaScriptCore/profiler/FunctionCallProfile.cpp

@@ -112 +112 @@
             printf("  ");
 
-        printf("%.0fms %s\n", m_timeSum, m_functionName.UTF8String().c_str());
+        printf("%.3fms %s\n", m_timeSum, m_functionName.UTF8String().c_str());
     } else
         printf("%s\n", m_functionName.UTF8String().c_str());
@@ -124 +124 @@
 
 // print the profiled data in a format that matches the tool sample's output.
-double FunctionCallProfile::printDataSampleStyle(int indentLevel) const
+double FunctionCallProfile::printDataSampleStyle(int indentLevel, FunctionCallHashCount& countedFunctions) const
 {
     printf("    ");
 
     // Print function names
+    const char* name = m_functionName.UTF8String().c_str();
+    double sampleCount = m_timeSum * 1000;
     if (indentLevel) {
         for (int i = 0; i < indentLevel; ++i)
             printf("  ");
 
-        // We've previously asserted that m_timeSum will always be >= 1
-        printf("%.0f %s\n", m_timeSum ? m_timeSum : 1, m_functionName.UTF8String().c_str());
+         countedFunctions.add(m_functionName.rep());
+
+        printf("%.0f %s\n", sampleCount ? sampleCount : 1, name);
     } else
-        printf("%s\n", m_functionName.UTF8String().c_str());
+        printf("%s\n", name);
 
     ++indentLevel;
 
     // Print children's names and information
-    double sumOfChildrensTimes = 0.0;
+    double sumOfChildrensCount = 0.0;
     for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        sumOfChildrensTimes += (*currentChild)->printDataSampleStyle(indentLevel);
+        sumOfChildrensCount += (*currentChild)->printDataSampleStyle(indentLevel, countedFunctions);
 
-    // Print remainder of time to match sample's output
-    if (sumOfChildrensTimes < m_timeSum) {
+    sumOfChildrensCount *= 1000;    //
+    // Print remainder of samples to match sample's output
+    if (sumOfChildrensCount < sampleCount) {
         printf("    ");
         while (indentLevel--)
             printf("  ");
 
-        printf("%f %s\n", m_timeSum - sumOfChildrensTimes, m_functionName.UTF8String().c_str());
+        printf("%.0f %s\n", sampleCount - sumOfChildrensCount, m_functionName.UTF8String().c_str());
     }