Changeset 36058 in webkit for trunk/JavaScriptCore/profiler/Profiler.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/Profiler.cpp (modified) (8 diffs)

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -45 +45 @@
 static unsigned ProfilesUID = 0;
 
-static CallIdentifier createCallIdentifier(ExecState*, JSObject*);
-static CallIdentifier createCallIdentifier(ExecState*, const UString& sourceURL, int startingLineNumber);
 static CallIdentifier createCallIdentifierFromFunctionImp(ExecState*, JSFunction*);
 
@@ -68 +66 @@
     for (size_t i = 0; i < m_currentProfiles.size(); ++i) {
         ProfileGenerator* profileGenerator = m_currentProfiles[i].get();
-        if (!profileGenerator->stoppedProfiling() && profileGenerator->originatingGlobalExec() == globalExec && profileGenerator->title() == title)
+        if (profileGenerator->originatingGlobalExec() == globalExec && profileGenerator->title() == title)
             return;
     }
 
     s_sharedEnabledProfilerReference = this;
-    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, globalExec, exec->lexicalGlobalObject()->profileGroup(), client, ++ProfilesUID);
+    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, exec, client, ++ProfilesUID);
     m_currentProfiles.append(profileGenerator);
 }
@@ -82 +80 @@
     for (ptrdiff_t i = m_currentProfiles.size() - 1; i >= 0; --i) {
         ProfileGenerator* profileGenerator = m_currentProfiles[i].get();
-        if (!profileGenerator->stoppedProfiling() && profileGenerator->originatingGlobalExec() == globalExec && (title.isNull() || profileGenerator->title() == title))
-            m_currentProfiles[i]->stopProfiling();
-    }
-}
-
-void Profiler::didFinishAllExecution(ExecState* exec)
-{
-    ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
-    for (ptrdiff_t i = m_currentProfiles.size() - 1; i >= 0; --i) {
-        ProfileGenerator* profileGenerator = m_currentProfiles[i].get();
-        if (profileGenerator->originatingGlobalExec() == globalExec && profileGenerator->didFinishAllExecution()) {
+        if (profileGenerator->originatingGlobalExec() == globalExec && (title.isNull() || profileGenerator->title() == title)) {
             PassRefPtr<ProfileGenerator> prpProfileGenerator = m_currentProfiles[i].release();
             m_currentProfiles.remove(i);
@@ -99 +87 @@
                 s_sharedEnabledProfilerReference = 0;
 
+
+            prpProfileGenerator->stopProfiling();
             if (ProfilerClient* client = prpProfileGenerator->client())
                 client->finishedProfiling(prpProfileGenerator->profile());
@@ -117 +107 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, createCallIdentifier(exec, calledFunction), exec->lexicalGlobalObject()->profileGroup());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, createCallIdentifier(exec, calledFunction, "", 0), exec->lexicalGlobalObject()->profileGroup());
 }
 
@@ -124 +114 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    CallIdentifier callIdentifier = createCallIdentifier(exec, sourceURL, startingLineNumber);
+    CallIdentifier callIdentifier = createCallIdentifier(exec, 0, sourceURL, startingLineNumber);
 
     dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, callIdentifier, exec->lexicalGlobalObject()->profileGroup());
@@ -133 +123 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(exec, calledFunction), exec->lexicalGlobalObject()->profileGroup());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(exec, calledFunction, "", 0), exec->lexicalGlobalObject()->profileGroup());
 }
 
@@ -140 +130 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(exec, sourceURL, startingLineNumber), exec->lexicalGlobalObject()->profileGroup());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(exec, 0, sourceURL, startingLineNumber), exec->lexicalGlobalObject()->profileGroup());
 }
 
-CallIdentifier createCallIdentifier(ExecState* exec, JSObject* calledFunction)
+CallIdentifier Profiler::createCallIdentifier(ExecState* exec, JSObject* calledFunction, const UString& defaultSourceURL, int defaultLineNumber)
 {
+    if (!calledFunction)
+        return CallIdentifier(GlobalCodeExecution, defaultSourceURL, defaultLineNumber);
+
     if (calledFunction->inherits(&JSFunction::info))
         return createCallIdentifierFromFunctionImp(exec, static_cast<JSFunction*>(calledFunction));
     if (calledFunction->inherits(&InternalFunction::info))
-        return CallIdentifier(static_cast<InternalFunction*>(calledFunction)->name(exec), "", 0);
+        return CallIdentifier(static_cast<InternalFunction*>(calledFunction)->name(exec), defaultSourceURL, defaultLineNumber);
 
     UString name = "(" + calledFunction->className() + " object)";
-    return CallIdentifier(name, 0, 0);
-}
-
-CallIdentifier createCallIdentifier(ExecState*, const UString& sourceURL, int startingLineNumber)
-{
-    return CallIdentifier(GlobalCodeExecution, sourceURL, startingLineNumber);
+    return CallIdentifier(name, defaultSourceURL, defaultLineNumber);
 }