Changeset 34710 in webkit for trunk/JavaScriptCore/profiler/Profile.cpp

Timestamp:

Jun 20, 2008, 9:39:23 PM (17 years ago)

Author:

[email protected]

Message:

Fixed an ASSERT(m_actualSelfTime <= m_actualTotalTime) when starting
and stopping a profile from the Develop menu. Also prevents
inserting an incorrect parent node as the new head after profiling
is stopped from the Develop menu.

Reviewed by Dan Bernstein.

• profiler/Profile.cpp: (KJS::Profile::stopProfiling): If the current node is already the head then there is no more need to record future nodes in didExecute. (KJS::Profile::didExecute): Move the code of setupCurrentNodeAsStopped into here since this was the only caller. When setting the total time keep any current total time while adding the self time of the head. (KJS::Profile::setupCurrentNodeAsStopped): Removed.
• profiler/Profile.h: Removed setupCurrentNodeAsStopped.

File:

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

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -66 +66 @@
     removeProfileEnd();
 
+    // Already at the head, set m_currentNode to prevent
+    // didExecute from recording more nodes.
+    if (m_currentNode == m_head)
+        m_currentNode = 0;
+
     m_stoppedProfiling = true;
 }
@@ -141 +146 @@
 
         if (m_stoppedProfiling) {
-            setupCurrentNodeAsStopped();
+            m_currentNode->setTotalTime(m_currentNode->totalTime() + m_head->selfTime());
+            m_head->setSelfTime(0.0);
+            m_currentNode->stopProfiling();
             m_currentNode = 0;
         } else
@@ -155 +162 @@
 
     m_currentNode = m_currentNode->didExecute();
-}
-
-void Profile::setupCurrentNodeAsStopped() {
-    m_currentNode->setTotalTime(m_head->selfTime());
-    m_head->setSelfTime(0.0);
-    m_currentNode->stopProfiling();
 }