Changeset 36068 in webkit for trunk/JavaScriptCore/profiler/Profiler.cpp

Timestamp:

Sep 3, 2008, 2:53:17 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

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

Reviewed by Tim.

Remove the rest of the "zombie" code from the profiler.

• There is no longer a need for the ProfilerClient callback mechanism.

• API/JSProfilerPrivate.cpp: (JSStartProfiling):
• JavaScriptCore.exp:
• profiler/HeavyProfile.h:
• profiler/ProfileGenerator.cpp: (KJS::ProfileGenerator::create): (KJS::ProfileGenerator::ProfileGenerator):
• profiler/ProfileGenerator.h: (KJS::ProfileGenerator::profileGroup):
• profiler/Profiler.cpp: (KJS::Profiler::startProfiling): (KJS::Profiler::stopProfiling): Immediately return the profile when stopped instead of using a callback.
• profiler/Profiler.h:
• profiler/TreeProfile.h:

WebCore:

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

Reviewed by Tim.

Remove the rest of the "zombie" code from the profiler.

• There is no longer a need for the ProfilerClient callback mechanism.

• page/Console.cpp: (WebCore::Console::Console): (WebCore::Console::profile): (WebCore::Console::profileEnd): Move the variables from the header to here since we don't have to wait for a callback to use them.
• page/Console.h:
• page/InspectorController.cpp: (WebCore::InspectorController::startUserInitiatedProfiling): (WebCore::InspectorController::stopUserInitiatedProfiling):
• page/InspectorController.h:

File:

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

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -57 +57 @@
 }   
 
-void Profiler::startProfiling(ExecState* exec, const UString& title, ProfilerClient* client)
+void Profiler::startProfiling(ExecState* exec, const UString& title)
 {
     ASSERT_ARG(exec, exec);
@@ -71 +71 @@
 
     s_sharedEnabledProfilerReference = this;
-    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, exec, client, ++ProfilesUID);
+    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, exec, ++ProfilesUID);
     m_currentProfiles.append(profileGenerator);
 }
 
-void Profiler::stopProfiling(ExecState* exec, const UString& title)
+PassRefPtr<Profile> Profiler::stopProfiling(ExecState* exec, const UString& title)
 {
     ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
@@ -81 +81 @@
         ProfileGenerator* profileGenerator = m_currentProfiles[i].get();
         if (profileGenerator->originatingGlobalExec() == globalExec && (title.isNull() || profileGenerator->title() == title)) {
-            PassRefPtr<ProfileGenerator> prpProfileGenerator = m_currentProfiles[i].release();
+            profileGenerator->stopProfiling();
+            RefPtr<Profile> returnProfile = profileGenerator->profile();
+
             m_currentProfiles.remove(i);
-
             if (!m_currentProfiles.size())
                 s_sharedEnabledProfilerReference = 0;
-
-
-            prpProfileGenerator->stopProfiling();
-            if (ProfilerClient* client = prpProfileGenerator->client())
-                client->finishedProfiling(prpProfileGenerator->profile());
+            
+            return returnProfile;
         }
     }
+
+    return 0;
 }