Changeset 33943 in webkit

Timestamp:

May 20, 2008 2:29:08 PM (16 years ago)

Author:

kmccullough@apple.com

Message:

2008-05-20 Kevin McCullough <​kmccullough@apple.com>

Reviewed by Tim.

<rdar://problem/5770054> JavaScript profiler (10928)
Removed only profiler-internal use of currentProfile since that concept
is changing.

• profiler/Profile.h: Now stopProfiling takes a time and bool as arguments. The time is used to calculate %s from and the bool tells if this node is the head node and should be the one calculating the time. (KJS::Profile::stopProfiling):
• profiler/ProfileNode.cpp: Ditto. (KJS::ProfileNode::stopProfiling):
• profiler/ProfileNode.h: Ditto.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• profiler/Profile.h (modified) (1 diff)
• profiler/ProfileNode.cpp (modified) (3 diffs)
• profiler/ProfileNode.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-20  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by Tim.
+
+        <rdar://problem/5770054> JavaScript profiler (10928)
+        Removed only profiler-internal use of currentProfile since that concept
+        is changing.
+
+        * profiler/Profile.h: Now stopProfiling takes a time and bool as
+        arguments.  The time is used to calculate %s from and the bool tells
+        if this node is the head node and should be the one calculating the time.
+        (KJS::Profile::stopProfiling):
+        * profiler/ProfileNode.cpp: Ditto.
+        (KJS::ProfileNode::stopProfiling):
+        * profiler/ProfileNode.h: Ditto.
+
 2008-05-20  Kevin McCullough  <kmccullough@apple.com>
 

trunk/JavaScriptCore/profiler/Profile.h

@@ -44 +44 @@
         void didExecute(const Vector<CallIdentifier>& CallIdentifier);
 
-        void stopProfiling() { m_callTree->stopProfiling(); };
+        void stopProfiling() { m_callTree->stopProfiling(0, true); };
         const UString& title() const { return m_title; };
         ProfileNode* callTree() const { return m_callTree.get(); };

trunk/JavaScriptCore/profiler/ProfileNode.cpp

@@ -93 +93 @@
 }
 
-void ProfileNode::stopProfiling()
+void ProfileNode::stopProfiling(double totalProfileTime, bool headProfileNode)
 {
     if (m_startTime)
@@ -99 +99 @@
 
     ASSERT(m_selfTime == 0.0);
+
+    if (headProfileNode)
+        totalProfileTime = m_totalTime;
 
     // Calculate Self time and the percentages once we stop profiling.
     StackIterator endOfChildren = m_children.end();
     for (StackIterator currentChild = m_children.begin(); currentChild != endOfChildren; ++currentChild) {
-        (*currentChild)->stopProfiling();
+        (*currentChild)->stopProfiling(totalProfileTime);
         m_selfTime += (*currentChild)->totalTime();
     }
@@ -110 +113 @@
     m_selfTime = m_totalTime - m_selfTime;
 
-    m_totalPercent = (m_totalTime / Profiler::profiler()->currentProfile()->totalTime()) * 100.0;
-    m_selfPercent = (selfTime() / Profiler::profiler()->currentProfile()->totalTime()) * 100.0;
+    m_totalPercent = (m_totalTime / totalProfileTime) * 100.0;
+    m_selfPercent = (m_selfTime / totalProfileTime) * 100.0;
 }
 

trunk/JavaScriptCore/profiler/ProfileNode.h

@@ -64 +64 @@
         ProfileNode* findChild(const CallIdentifier& functionName);
 
-        void stopProfiling();
+        void stopProfiling(double totalProfileTime, bool headProfileNode = false);
 
         CallIdentifier callIdentifier() const { return m_callIdentifier; }