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

Timestamp:

Jun 24, 2008, 2:22:21 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-24 Kevin McCullough <​[email protected]>

Reviewed by Tim.

<rdar://problem/6031594> JSProfiler: Profiler goes into an infinite
loop sometimes.
<rdar://problem/6031603> JSProfiler: Profiler asserts in debug and
give the wrong times in release

Fixed two issues found by Tim in the same test.

• profiler/Profile.cpp: (KJS::Profile::removeProfileStart): No longer take profile's time from all ancestors, but instead attribute it to its parent. Also add an Assert to ensure we only delete the child we mean to. (KJS::Profile::removeProfileEnd): Ditto for profileEnd. (KJS::Profile::didExecute): Cleaned up the execution order and correctly attribute all of the parent's time to the new node.
• profiler/ProfileNode.cpp: If this node does not have a startTime it should not get a giant total time, but instead be 0. (KJS::ProfileNode::endAndRecordCall):
• profiler/ProfileNode.h: (KJS::ProfileNode::removeChild): Should reset the sibling pointers since one of them has been removed.

File:

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

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -100 +100 @@
         return;
 
-    for (ProfileNode* currentParent = currentNode->parent(); currentParent; currentParent = currentParent->parent())
-        currentParent->setTotalTime(currentParent->totalTime() - currentNode->totalTime());
-
+    // Attribute the time of the node aobut to be removed to the self time of its parent
+    currentNode->parent()->setSelfTime(currentNode->parent()->selfTime() + currentNode->totalTime());
+
+    ASSERT(currentNode->callIdentifier() == (currentNode->parent()->children()[0])->callIdentifier());
     currentNode->parent()->removeChild(0);
 }
@@ -115 +116 @@
         return;
 
-    for (ProfileNode* currentParent = currentNode->parent(); currentParent; currentParent = currentParent->parent())
-        currentParent->setTotalTime(currentParent->totalTime() - currentNode->totalTime());
-
+    // Attribute the time of the node aobut to be removed to the self time of its parent
+    currentNode->parent()->setSelfTime(currentNode->parent()->selfTime() + currentNode->totalTime());
+
+    ASSERT(currentNode->callIdentifier() == (currentNode->parent()->children()[currentNode->parent()->children().size() - 1])->callIdentifier());
     currentNode->parent()->removeChild(currentNode->parent()->children().size() - 1);
 }
@@ -139 +141 @@
         m_currentNode->setStartTime(m_head->startTime());
         m_currentNode->didExecute();
-        m_head->insertNode(m_currentNode.get());
 
         if (m_stoppedProfiling) {
-            m_currentNode->setTotalTime(m_currentNode->totalTime() + m_head->selfTime());
+            m_currentNode->setTotalTime(m_head->totalTime());
+            m_currentNode->setSelfTime(m_head->selfTime());
             m_head->setSelfTime(0.0);
-            m_currentNode->stopProfiling();
-            m_currentNode = 0;
-        } else
-            m_currentNode = m_head;
+        }
+
+        m_head->insertNode(m_currentNode.release());            
+        m_currentNode = m_stoppedProfiling ? 0 : m_head;
 
         return;