Changeset 33507 in webkit for trunk/JavaScriptCore/profiler/ProfileNode.cpp

Timestamp:

May 15, 2008, 7:51:33 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Tim.

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

• Cache some values to save on computing them repetitively. This will be a big savings when we sort since we won't have to walk the tree for every comparison!
• We cache these values when we end profiling because otherwise we won't know which profile to get the totalTime for the whole profile from without retaining a reference to the head profile or looking up the profile from the list of all profiles.
• Also it's safe to assume we won't be asked for these values while we are still profiling since the WebInspector only get's profileNodes from profiles that are in the allProfiles() list and a profile is only added to that list after it has finished and these values will no longer change.

• JavaScriptCore.exp:
• profiler/ProfileNode.cpp: (KJS::ProfileNode::ProfileNode): (KJS::ProfileNode::stopProfiling): (KJS::ProfileNode::printDataInspectorStyle): (KJS::ProfileNode::printDataSampleStyle): (KJS::ProfileNode::endAndRecordCall):
• profiler/ProfileNode.h: (KJS::ProfileNode::totalTime): (KJS::ProfileNode::selfTime): (KJS::ProfileNode::totalPercent): (KJS::ProfileNode::selfPercent):
• profiler/Profiler.cpp: (KJS::Profiler::stopProfiling):

File:

• trunk/JavaScriptCore/profiler/ProfileNode.cpp (modified) (5 diffs)

trunk/JavaScriptCore/profiler/ProfileNode.cpp

@@ -39 +39 @@
 ProfileNode::ProfileNode(const UString& name)
     : m_functionName(name)
-    , m_timeSum(0)
+    , m_totalTime (0.0)
+    , m_selfTime (0.0)
+    , m_totalPercent (0.0)
+    , m_selfPercent (0.0)
     , m_numberOfCalls(0)
 {
@@ -97 +100 @@
     for (StackIterator it = m_children.begin(); it != endOfChildren; ++it)
         (*it)->stopProfiling();
-}
 
-double ProfileNode::selfTime() const
-{
-    double sumChildrenTime = 0.0;
+    // Calculate Self time and the percentages once we stop profiling.
+    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
+        m_selfTime += (*currentChild)->totalTime();
+    ASSERT(m_selfTime <= m_totalTime);
+    m_selfTime = m_totalTime - m_selfTime;
 
-    for (StackIterator currentChild = m_children.begin(); currentChild != m_children.end(); ++currentChild)
-        sumChildrenTime += (*currentChild)->totalTime();
-
-    ASSERT(sumChildrenTime <= m_timeSum);
-
-    return m_timeSum - sumChildrenTime;
-}
-
-double ProfileNode::totalPercent() const
-{
-    return (m_timeSum / Profiler::profiler()->currentProfile()->totalTime()) * 100.0;
-}
-
-double ProfileNode::selfPercent() const
-{
-    return (selfTime() / Profiler::profiler()->currentProfile()->totalTime()) * 100.0;
+    m_totalPercent = (m_totalTime / Profiler::profiler()->currentProfile()->totalTime()) * 100.0;
+    m_selfPercent = (selfTime() / Profiler::profiler()->currentProfile()->totalTime()) * 100.0;
 }
 
@@ -128 +118 @@
             printf("  ");
 
-        printf("%.3fms %s\n", m_timeSum, m_functionName.UTF8String().c_str());
+        printf("%d SelfTime %.3fms %.3f%% TotalTime %.3fms%.3f%% FunctionName %s\n", m_numberOfCalls, m_selfTime, selfPercent(), m_totalTime, totalPercent(), m_functionName.UTF8String().c_str());
     } else
         printf("%s\n", m_functionName.UTF8String().c_str());
@@ -146 +136 @@
     // Print function names
     const char* name = m_functionName.UTF8String().c_str();
-    double sampleCount = m_timeSum * 1000;
+    double sampleCount = m_totalTime * 1000;
     if (indentLevel) {
         for (int i = 0; i < indentLevel; ++i)
@@ -174 +164 @@
     }
 
-    return m_timeSum;
+    return m_totalTime;
 }
 
 void ProfileNode::endAndRecordCall()
 {
-    m_timeSum += getCurrentUTCTime() - m_startTime;
+    m_totalTime += getCurrentUTCTime() - m_startTime;
     m_startTime = 0.0;