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

Timestamp:

Jun 25, 2008, 2:44:42 PM (17 years ago)

Author:

[email protected]

Message:

Fixes an ASSERT in the profiler when starting multiple profiles
with the same name inside the same function/program.

Reviewed by Kevin McCullough.

• profiler/Profile.cpp: (KJS::Profile::Profile): Initialize m_stoppedCallDepth to zero. (KJS::Profile::stopProfiling): Set the current node to the parent, because we are in a call that will not get a didExecute call. (KJS::Profile::removeProfile): Increment m_stoppedCallDepth to account for didExecute not being called for profile. (KJS::Profile::willExecute): Increment m_stoppedCallDepth if stopped. (KJS::Profile::didExecute): Decrement m_stoppedCallDepth if stopped and greater than zero, and return early.
• profiler/Profile.h: Added stoppedProfiling().
• profiler/Profiler.cpp: (KJS::Profiler::findProfile): Removed. (KJS::Profiler::startProfiling): Don't return early for stopped profiles. (KJS::Profiler::stopProfiling): Skipp stopped profiles. (KJS::Profiler::didFinishAllExecution): Code clean-up.
• profiler/Profiler.h: Removed findProfile.

File:

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

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -47 +47 @@
     , m_originatingGlobalExec(originatingGlobalExec)
     , m_pageGroupIdentifier(pageGroupIdentifier)
+    , m_stoppedCallDepth(0)
     , m_client(client)
     , m_stoppedProfiling(false)
@@ -62 +63 @@
     removeProfileEnd();
 
-    // Already at the head, set m_currentNode to prevent
-    // didExecute from recording more nodes.
-    if (m_currentNode == m_head)
-        m_currentNode = 0;
+    ASSERT(m_currentNode);
+
+    // Set the current node to the parent, because we are in a call that
+    // will not get didExecute call.
+    m_currentNode = m_currentNode->parent();
 
     m_stoppedProfiling = true;
@@ -100 +102 @@
         return;
 
+    // Increment m_stoppedCallDepth to account for didExecute not being called for console.profile.
+    ++m_stoppedCallDepth;
+
     // 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());
@@ -125 +130 @@
 void Profile::willExecute(const CallIdentifier& callIdentifier)
 {
-    if (m_stoppedProfiling)
-        return;
+    if (m_stoppedProfiling) {
+        ++m_stoppedCallDepth;
+        return;
+    }
 
     ASSERT(m_currentNode);
@@ -136 +143 @@
     if (!m_currentNode)
         return;
+
+    if (m_stoppedProfiling && m_stoppedCallDepth > 0) {
+        --m_stoppedCallDepth;
+        return;
+    }
 
     if (m_currentNode == m_head) {
@@ -154 +166 @@
     }
 
-    if (m_stoppedProfiling) {
-        m_currentNode = m_currentNode->parent();
-        return;
-    }
-
-    m_currentNode = m_currentNode->didExecute();
+    // Set m_currentNode to the parent (which didExecute returns). If stopped, just set the
+    // m_currentNode to the parent and don't call didExecute.
+    m_currentNode = m_stoppedProfiling ? m_currentNode->parent() : m_currentNode->didExecute();
 }