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

Timestamp:

Jul 7, 2008, 11:12:09 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-07-07 Kevin McCullough <​[email protected]>

Reviewed by Darin.

When the profiler is running it gathers information and creates a
Profile. After it finishes the Profile can be sorted and have other
data refinements run over it. Both of these were done in the same class
before. Now I split the gathering operations into a new class called
ProfileGenerator.

• JavaScriptCore.xcodeproj/project.pbxproj:
• profiler/Profile.cpp: Removed code related to the gather stage of a Profile's creation. (KJS::Profile::create): (KJS::Profile::Profile):
• profiler/Profile.h: Ditto. (KJS::Profile::title): (KJS::Profile::callTree): (KJS::Profile::setHead):
• profiler/ProfileGenerator.cpp: Added. This is the class that will handle the stage of creating a Profile. Once the Profile is finished being created, this class goes away. (KJS::ProfileGenerator::create): (KJS::ProfileGenerator::ProfileGenerator): (KJS::ProfileGenerator::title): (KJS::ProfileGenerator::willExecute): (KJS::ProfileGenerator::didExecute): (KJS::ProfileGenerator::stopProfiling): (KJS::ProfileGenerator::didFinishAllExecution): (KJS::ProfileGenerator::removeProfileStart): (KJS::ProfileGenerator::removeProfileEnd):
• profiler/ProfileGenerator.h: Added. (KJS::ProfileGenerator::profile): (KJS::ProfileGenerator::originatingGlobalExec): (KJS::ProfileGenerator::pageGroupIdentifier): (KJS::ProfileGenerator::client): (KJS::ProfileGenerator::stoppedProfiling):
• profiler/Profiler.cpp: Now operates with the ProfileGenerator instead of the Profile. (KJS::Profiler::startProfiling): (KJS::Profiler::stopProfiling): (KJS::Profiler::didFinishAllExecution): It is here that the Profile is handed off to its client and the Profile Generator is no longer needed. (KJS::dispatchFunctionToProfiles): (KJS::Profiler::willExecute): (KJS::Profiler::didExecute):
• profiler/Profiler.h: Cleaned up the includes and subsequently the forward declarations. Also use the new ProfileGenerator. (KJS::ProfilerClient::~ProfilerClient): (KJS::Profiler::currentProfiles):
• profiler/TreeProfile.cpp: Use Profile's new interface. (KJS::TreeProfile::create): (KJS::TreeProfile::TreeProfile):
• profiler/TreeProfile.h:

WebCore:

2008-07-07 Kevin McCullough <​[email protected]>

Reviewed by Darin.

Because profiler.h no longer #includes profile.h we need to explicitly
include it in console.cpp.

• page/Console.cpp:

File:

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

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -34 +34 @@
 #include "JSGlobalObject.h"
 #include "Profile.h"
+#include "ProfileGenerator.h"
 #include "ProfileNode.h"
 #include <stdio.h>
@@ -64 +65 @@
     ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
     for (size_t i = 0; i < m_currentProfiles.size(); ++i) {
-        Profile* profile = m_currentProfiles[i].get();
-        if (!profile->stoppedProfiling() && profile->originatingGlobalExec() == globalExec && profile->title() == title)
+        ProfileGenerator* profileGenerator = m_currentProfiles[i].get();
+        if (!profileGenerator->stoppedProfiling() && profileGenerator->originatingGlobalExec() == globalExec && profileGenerator->title() == title)
             return;
     }
 
     s_sharedEnabledProfilerReference = this;
-    RefPtr<Profile> profile = Profile::create(title, globalExec, exec->lexicalGlobalObject()->pageGroupIdentifier(), client);
-    m_currentProfiles.append(profile);
+    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, globalExec, exec->lexicalGlobalObject()->pageGroupIdentifier(), client);
+    m_currentProfiles.append(profileGenerator);
 }
 
@@ -78 +79 @@
     ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
     for (ptrdiff_t i = m_currentProfiles.size() - 1; i >= 0; --i) {
-        Profile* profile = m_currentProfiles[i].get();
-        if (!profile->stoppedProfiling() && profile->originatingGlobalExec() == globalExec && (title.isNull() || profile->title() == title))
+        ProfileGenerator* profileGenerator = m_currentProfiles[i].get();
+        if (!profileGenerator->stoppedProfiling() && profileGenerator->originatingGlobalExec() == globalExec && (title.isNull() || profileGenerator->title() == title))
             m_currentProfiles[i]->stopProfiling();
     }
@@ -88 +89 @@
     ExecState* globalExec = exec->lexicalGlobalObject()->globalExec();
     for (ptrdiff_t i = m_currentProfiles.size() - 1; i >= 0; --i) {
-        Profile* profile = m_currentProfiles[i].get();
-        if (profile->originatingGlobalExec() == globalExec && profile->didFinishAllExecution()) {
-            PassRefPtr<Profile> prpProfile = m_currentProfiles[i].release();        
+        ProfileGenerator* profileGenerator = m_currentProfiles[i].get();
+        if (profileGenerator->originatingGlobalExec() == globalExec && profileGenerator->didFinishAllExecution()) {
+            PassRefPtr<ProfileGenerator> prpProfileGenerator = m_currentProfiles[i].release();
             m_currentProfiles.remove(i);
 
@@ -96 +97 @@
                 s_sharedEnabledProfilerReference = 0;
 
-            if (ProfilerClient* client = prpProfile->client())
-                client->finishedProfiling(prpProfile);
+            if (ProfilerClient* client = prpProfileGenerator->client())
+                client->finishedProfiling(prpProfileGenerator->profile());
         }
     }
 }
 
-static inline void dispatchFunctionToProfiles(const Vector<RefPtr<Profile> >& profiles, Profile::ProfileFunction function, const CallIdentifier& callIdentifier, unsigned currentPageGroupIdentifier)
+static inline void dispatchFunctionToProfiles(const Vector<RefPtr<ProfileGenerator> >& profiles, ProfileGenerator::ProfileFunction function, const CallIdentifier& callIdentifier, unsigned currentPageGroupIdentifier)
 {
     for (size_t i = 0; i < profiles.size(); ++i) {
@@ -114 +115 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &Profile::willExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
 }
 
@@ -123 +124 @@
     CallIdentifier callIdentifier = createCallIdentifier(sourceURL, startingLineNumber);
 
-    dispatchFunctionToProfiles(m_currentProfiles, &Profile::willExecute, callIdentifier, exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::willExecute, callIdentifier, exec->lexicalGlobalObject()->pageGroupIdentifier());
 }
 
@@ -130 +131 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &Profile::didExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(calledFunction), exec->lexicalGlobalObject()->pageGroupIdentifier());
 }
 
@@ -137 +138 @@
     ASSERT(!m_currentProfiles.isEmpty());
 
-    dispatchFunctionToProfiles(m_currentProfiles, &Profile::didExecute, createCallIdentifier(sourceURL, startingLineNumber), exec->lexicalGlobalObject()->pageGroupIdentifier());
+    dispatchFunctionToProfiles(m_currentProfiles, &ProfileGenerator::didExecute, createCallIdentifier(sourceURL, startingLineNumber), exec->lexicalGlobalObject()->pageGroupIdentifier());
 }