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

Timestamp:

Apr 18, 2008, 2:49:56 PM (17 years ago)

Author:

[email protected]

Message:

2008-04-18 Kevin McCullough <​[email protected]>

Reviewed by Sam and Adam.

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

• Cleaned up the header file and made some functions static, added a new, sane, printing function, and fixed a few minor bugs.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• profiler/FunctionCallProfile.cpp: (KJS::FunctionCallProfile::didExecute): Removed assertion that time is

  0 because at ms resolution that may not be true and only cross-
  

  platform way to get time differences is in ms. (KJS::FunctionCallProfile::printDataInspectorStyle): Added a new printing function for dumping data in a sane style. (KJS::FunctionCallProfile::printDataSampleStyle): Fixed a bug where we displayed too much precision when printing our floats. Also added logic to make sure we don't display 0 because that doesn't make sense for a sampling profile.
• profiler/FunctionCallProfile.h:
• profiler/Profiler.cpp: Moved functions that could be static into the implementation, and chaned the ASSERTs to early returns. I did this because console.profile() is a JS function and so was being profiled but asserting because the profiler had not been started! In the future I would like to put the ASSERTs back and not profile the calls to console.profile() and console.profileEnd(). (KJS::Profiler::willExecute): (KJS::Profiler::didExecute): (KJS::getStackNames): Fixed a bug where the wrong ExecState was being used. (KJS::getFunctionName): (KJS::Profiler::printDataInspectorStyle):
• profiler/Profiler.h:

File:

• trunk/JavaScriptCore/profiler/FunctionCallProfile.cpp (modified) (3 diffs)

trunk/JavaScriptCore/profiler/FunctionCallProfile.cpp

@@ -62 +62 @@
         m_timeSum += getCurrentUTCTime() - m_startTime;
 
-        ASSERT(m_timeSum > 0);
+        // FIXME: We may need something with higher resolution than ms as some functions will take 0ms.
         return;
     }
@@ -97 +97 @@
 }
 
+void FunctionCallProfile::printDataInspectorStyle(int indentLevel) const
+{
+    // Print function names
+    if (indentLevel) {
+        for (int i = 0; i < indentLevel; ++i)
+            printf("  ");
+
+        printf("%.0fms %s\n", m_timeSum, m_functionName.UTF8String().c_str());
+    } else
+        printf("%s\n", m_functionName.UTF8String().c_str());
+
+    ++indentLevel;
+
+    // Print children's names and information
+    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
+        (*currentChild)->printDataInspectorStyle(indentLevel);
+}
+
 // print the profiled data in a format that matches the tool sample's output.
-double FunctionCallProfile::printDataSampleStyle(int indentLevel)
+double FunctionCallProfile::printDataSampleStyle(int indentLevel) const
 {
     printf("    ");
@@ -108 +126 @@
 
         // We've previously asserted that m_timeSum will always be >= 1
-        printf("%f %s\n", m_timeSum, m_functionName.UTF8String().c_str());
+        printf("%.0f %s\n", m_timeSum ? m_timeSum : 1, m_functionName.UTF8String().c_str());
     } else
         printf("%s\n", m_functionName.UTF8String().c_str());