Changeset 34060 in webkit for trunk/JavaScriptCore

Timestamp:

May 22, 2008, 11:57:44 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Adam.

Fix a bug in the profiler where time in the current function is given to
(idle).

• profiler/Profile.cpp: (KJS::Profile::didExecute): Set the start time and then call didExecute to calculate the time spent in this function.
• profiler/ProfileNode.cpp: Remove confusing calculations that are no longer necessary. (KJS::ProfileNode::insertNode):
• profiler/ProfileNode.h: Expose access to the start time to allow the simpler time calculations above. (KJS::ProfileNode::startTime): (KJS::ProfileNode::setStartTime):

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-22  Kevin McCullough  <[email protected]>
+
+        Reviewed by Adam.
+
+        Fix a bug in the profiler where time in the current function is given to
+        (idle).
+
+        * profiler/Profile.cpp:
+        (KJS::Profile::didExecute): Set the start time and then call didExecute
+        to calculate the time spent in this function.
+        * profiler/ProfileNode.cpp: Remove confusing calculations that are no
+        longer necessary.
+        (KJS::ProfileNode::insertNode):
+        * profiler/ProfileNode.h: Expose access to the start time to allow the
+        simpler time calculations above.
+        (KJS::ProfileNode::startTime):
+        (KJS::ProfileNode::setStartTime):
+
 2008-05-22  Adam Roben  <[email protected]>
 

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -65 +65 @@
     if (m_currentNode == m_headNode) {
         m_currentNode = ProfileNode::create(callIdentifier, m_headNode.get(), m_headNode.get());
+        m_currentNode->setStartTime(m_headNode->startTime());
+        m_currentNode->didExecute();
         m_headNode->insertNode(m_currentNode.release());
         m_currentNode = m_headNode;

trunk/JavaScriptCore/profiler/ProfileNode.cpp

@@ -105 +105 @@
     RefPtr<ProfileNode> node = prpNode;
 
-    double sumOfChildrensTime = 0.0;
-    for (unsigned i = 0; i < m_children.size(); ++i) {
-        sumOfChildrensTime += m_children[i]->totalTime();
+    for (unsigned i = 0; i < m_children.size(); ++i)
         node->addChild(m_children[i].release());
-    }
 
     m_children.clear();
-
-    node->didExecute();
-    node->setTotalTime(sumOfChildrensTime);
-    node->setSelfTime(0.0);
     m_children.append(node.release());
 }

trunk/JavaScriptCore/profiler/ProfileNode.h

@@ -74 +74 @@
         unsigned lineNumber() const { return m_callIdentifier.lineNumber; }
 
+        double startTime() const { return m_startTime; }
+        void setStartTime(double startTime) { m_startTime = startTime; }
         double totalTime() const { return m_visibleTotalTime; }
         void setTotalTime(double time) { m_actualTotalTime = time; m_visibleTotalTime = time; }