Changeset 36058 in webkit for trunk/JavaScriptCore/profiler/ProfileGenerator.cpp

Timestamp:

Sep 3, 2008, 10:35:42 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-09-02 Kevin McCullough <​[email protected]>

Reviewed by Darin and Tim.

Remove most of the "zombie" mode from the profiler. Next we will need
to remove the client callback mechanism in profiles.

• This simplifies the code, leverages the recent changes I've made in getting line numbers from SquirrelFish, and is a slight speed improvement on SunSpider.
• Also the "zombie" mode was a constant source of odd edge cases and obscure bugs so it's good to remove since all of its issues may not have been found.

• API/JSProfilerPrivate.cpp: No need to call didFinishAllExecution() any more. (JSEndProfiling):
• JavaScriptCore.exp: Export the new signature of retrieveLastCaller()
• VM/Machine.cpp: (KJS::Machine::execute): No need to call didFinishAllExecution() any more. (KJS::Machine::retrieveCaller): Now operates on InternalFunctions now since the RegisterFile is no longer guaranteeded to store only JSFunctions (KJS::Machine::retrieveLastCaller): Now also retrieve the function's name (KJS::Machine::callFrame): A result of changing retrieveCaller()
• VM/Machine.h:
• VM/Register.h:
• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::~JSGlobalObject):
• kjs/nodes.h:
• profiler/ProfileGenerator.cpp: (KJS::ProfileGenerator::create): Now pass the original exec and get the global exec and client when necessary. We need the original exec so we can have the stack frame where profiling started. (KJS::ProfileGenerator::ProfileGenerator): ditto. (KJS::ProfileGenerator::addParentForConsoleStart): This is where the parent to star of the profile is added, if there is one. (KJS::ProfileGenerator::willExecute): Remove uglyness! (KJS::ProfileGenerator::didExecute): Ditto! (KJS::ProfileGenerator::stopProfiling): (KJS::ProfileGenerator::removeProfileStart): Use a better way to find and remove the function we are looking for. (KJS::ProfileGenerator::removeProfileEnd): Ditto.
• profiler/ProfileGenerator.h: (KJS::ProfileGenerator::client):
• profiler/ProfileNode.cpp: (KJS::ProfileNode::removeChild): Add a better way to remove a child from a ProfileNode. (KJS::ProfileNode::stopProfiling): (KJS::ProfileNode::debugPrintData): Modified a debug-only diagnostic function to be sane.
• profiler/ProfileNode.h:
• profiler/Profiler.cpp: Change to pass the original exec state. (KJS::Profiler::startProfiling): (KJS::Profiler::stopProfiling): (KJS::Profiler::willExecute): (KJS::Profiler::didExecute): (KJS::Profiler::createCallIdentifier):
• profiler/Profiler.h:

WebCore:

2008-09-03 Kevin McCullough <​[email protected]>

Reviewed by Darin and Tim.

Remove most of the "zombie" mode from the profiler. Next we will need
to remove the client callback mechanism in profiles.

• These changes are a result of changes to JSCore.

• manual-tests/inspector/profiler-test-nested-start-and-stop-profiler.html:
• page/Console.cpp: (WebCore::retrieveLastCaller): (WebCore::Console::profileEnd):
• page/InspectorController.cpp: (WebCore::InspectorController::stopUserInitiatedProfiling):

File:

• trunk/JavaScriptCore/profiler/ProfileGenerator.cpp (modified) (9 diffs)

trunk/JavaScriptCore/profiler/ProfileGenerator.cpp

@@ -27 +27 @@
 #include "ProfileGenerator.h"
 
+#include "ExecState.h"
+#include "JSGlobalObject.h"
+#include "JSStringRef.h"
+#include "JSFunction.h"
+#include "Machine.h"
 #include "Profile.h"
 #include "Profiler.h"
@@ -35 +40 @@
 static const char* NonJSExecution = "(idle)";
 
-PassRefPtr<ProfileGenerator> ProfileGenerator::create(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client, unsigned uid)
+PassRefPtr<ProfileGenerator> ProfileGenerator::create(const UString& title, ExecState* originatingExec, ProfilerClient* client, unsigned uid)
 {
-    return adoptRef(new ProfileGenerator(title, originatingGlobalExec, profileGroup, client, uid));
+    return adoptRef(new ProfileGenerator(title, originatingExec, client, uid));
 }
 
-ProfileGenerator::ProfileGenerator(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client, unsigned uid)
-    : m_originatingGlobalExec(originatingGlobalExec)
-    , m_profileGroup(profileGroup)
+ProfileGenerator::ProfileGenerator(const UString& title, ExecState* originatingExec, ProfilerClient* client, unsigned uid)
+    : m_originatingGlobalExec(originatingExec->lexicalGlobalObject()->globalExec())
+    , m_profileGroup(originatingExec->lexicalGlobalObject()->profileGroup())
     , m_client(client)
-    , m_stoppedProfiling(false)
-    , m_stoppedCallDepth(0)
 {
     m_profile = Profile::create(title, uid);
     m_currentNode = m_head = m_profile->head();
+
+    addParentForConsoleStart(originatingExec);
+}
+
+void ProfileGenerator::addParentForConsoleStart(ExecState* exec)
+{
+    int lineNumber;
+    int sourceID;
+    UString sourceURL;
+    JSValue* function;
+
+    exec->machine()->retrieveLastCaller(exec, lineNumber, sourceID, sourceURL, function);
+    m_currentNode = ProfileNode::create(Profiler::createCallIdentifier(exec, function ? function->toThisObject(exec) : 0, sourceURL, lineNumber), m_head.get(), m_head.get());
+    m_head->insertNode(m_currentNode.get());
 }
 
@@ -64 +81 @@
     }
 
-    if (m_stoppedProfiling) {
-        ++m_stoppedCallDepth;
-        return;
-    }
-
-    ASSERT(m_currentNode);
+    ASSERT_ARG(m_currentNode, m_currentNode);
     m_currentNode = m_currentNode->willExecute(callIdentifier);
 }
@@ -81 +93 @@
     }
 
-    if (!m_currentNode)
-        return;
-
-    if (m_stoppedProfiling && m_stoppedCallDepth > 0) {
-        --m_stoppedCallDepth;
+    ASSERT_ARG(m_currentNode, m_currentNode);
+    if (m_currentNode->callIdentifier() != callIdentifier) {
+        RefPtr<ProfileNode> returningNode = ProfileNode::create(callIdentifier, m_head.get(), m_currentNode.get());
+        returningNode->setStartTime(m_currentNode->startTime());
+        returningNode->didExecute();
+        m_currentNode->insertNode(returningNode.release());
         return;
     }
 
-    if (m_currentNode == m_head) {
-        m_currentNode = ProfileNode::create(callIdentifier, m_head.get(), m_head.get());
-        m_currentNode->setStartTime(m_head->startTime());
-        m_currentNode->didExecute();
-
-        if (m_stoppedProfiling) {
-            m_currentNode->setTotalTime(m_head->totalTime());
-            m_currentNode->setSelfTime(m_head->selfTime());
-            m_head->setSelfTime(0.0);
-        }
-
-        m_head->insertNode(m_currentNode.release());            
-        m_currentNode = m_stoppedProfiling ? 0 : m_head;
-
-        return;
-    }
-
-    // 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();
+    m_currentNode = m_currentNode->didExecute();
 }
 
@@ -118 +112 @@
     removeProfileEnd();
 
-    ASSERT(m_currentNode);
+    ASSERT_ARG(m_currentNode, m_currentNode);
 
     // Set the current node to the parent, because we are in a call that
@@ -124 +118 @@
     m_currentNode = m_currentNode->parent();
 
-    m_stoppedProfiling = true;
-}
-
-bool ProfileGenerator::didFinishAllExecution()
-{
-    if (!m_stoppedProfiling)
-        return false;
-
-    if (double headSelfTime = m_head->selfTime()) {
+   if (double headSelfTime = m_head->selfTime()) {
         RefPtr<ProfileNode> idleNode = ProfileNode::create(CallIdentifier(NonJSExecution, 0, 0), m_head.get(), m_head.get());
 
@@ -142 +128 @@
         m_head->addChild(idleNode.release());
     }
-
-    m_currentNode = 0;
-    m_originatingGlobalExec = 0;
-
-    m_profile->setHead(m_head.release());
-    return true;
 }
 
@@ -160 +140 @@
         return;
 
-    // Increment m_stoppedCallDepth to account for didExecute not being called for console.ProfileGenerator.
-    ++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());
-
-    ASSERT(currentNode->callIdentifier() == (currentNode->parent()->children()[0])->callIdentifier());
-    currentNode->parent()->removeChild(0);
+    currentNode->parent()->removeChild(currentNode);
 }
 
@@ -184 +159 @@
 
     ASSERT(currentNode->callIdentifier() == (currentNode->parent()->children()[currentNode->parent()->children().size() - 1])->callIdentifier());
-    currentNode->parent()->removeChild(currentNode->parent()->children().size() - 1);
+    currentNode->parent()->removeChild(currentNode);
 }