Changeset 35756 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 14, 2008, 11:11:20 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-08-14 Kevin McCullough <​[email protected]>

Reviewed by Tim.

<rdar://problem/6115819> Notify of profile in console

• Profiles now have a unique ID so that they can be linked to the console message that announces that a profile completed.

• profiler/HeavyProfile.cpp: (KJS::HeavyProfile::HeavyProfile):
• profiler/Profile.cpp: (KJS::Profile::create): (KJS::Profile::Profile):
• profiler/Profile.h: (KJS::Profile::uid):
• profiler/ProfileGenerator.cpp: (KJS::ProfileGenerator::create): (KJS::ProfileGenerator::ProfileGenerator):
• profiler/ProfileGenerator.h:
• profiler/Profiler.cpp: (KJS::Profiler::startProfiling):
• profiler/TreeProfile.cpp: (KJS::TreeProfile::create): (KJS::TreeProfile::TreeProfile):
• profiler/TreeProfile.h:

WebCore:

2008-08-14 Kevin McCullough <​[email protected]>

Reviewed by Tim.

<rdar://problem/6115819> Notify of profile in console

• page/InspectorController.cpp: (WebCore::InspectorController::addProfile): (WebCore::InspectorController::addProfileMessageToConsole): Called by addProfile this is the function that adds a message to the console that a profile finished.
• page/InspectorController.h:
• page/JavaScriptProfile.cpp: Expose the profiler's unique ID to match the console log to the profile in the web inspector. (WebCore::getUniqueIdCallback): (WebCore::ProfileClass):
• page/inspector/ProfilesPanel.js: Created a map of all the profiles by Id to bring up the requested profile. Also select and reveal the profile in the profile panel. And created displayTitleForProfileLink() which formats a title taking into account if it's user initiated or if there are multiples. Lasty, I put the user initiated profile in a variable.
• page/inspector/inspector.js: Make the profile title be a clickable link that will take the user to the identified profile. Also expose the count of user initiated profiles so they can be displayed in the console with the correct count.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• profiler/HeavyProfile.cpp (modified) (1 diff)
• profiler/Profile.cpp (modified) (1 diff)
• profiler/Profile.h (modified) (4 diffs)
• profiler/ProfileGenerator.cpp (modified) (2 diffs)
• profiler/ProfileGenerator.h (modified) (2 diffs)
• profiler/Profiler.cpp (modified) (2 diffs)
• profiler/TreeProfile.cpp (modified) (1 diff)
• profiler/TreeProfile.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-08-14  Kevin McCullough  <[email protected]>
+
+        Reviewed by Tim.
+
+        <rdar://problem/6115819> Notify of profile in console
+        - Profiles now have a unique ID so that they can be linked to the
+        console message that announces that a profile completed.
+
+        * profiler/HeavyProfile.cpp: 
+        (KJS::HeavyProfile::HeavyProfile):
+        * profiler/Profile.cpp:
+        (KJS::Profile::create):
+        (KJS::Profile::Profile):
+        * profiler/Profile.h:
+        (KJS::Profile::uid):
+        * profiler/ProfileGenerator.cpp:
+        (KJS::ProfileGenerator::create):
+        (KJS::ProfileGenerator::ProfileGenerator):
+        * profiler/ProfileGenerator.h:
+        * profiler/Profiler.cpp:
+        (KJS::Profiler::startProfiling):
+        * profiler/TreeProfile.cpp:
+        (KJS::TreeProfile::create):
+        (KJS::TreeProfile::TreeProfile):
+        * profiler/TreeProfile.h:
+
 2008-08-13  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/profiler/HeavyProfile.cpp

@@ -32 +32 @@
 
 HeavyProfile::HeavyProfile(TreeProfile* treeProfile)
-    : Profile(treeProfile->title())
+    : Profile(treeProfile->title(), treeProfile->uid())
 {
     m_treeProfile = treeProfile;

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -33 +33 @@
 namespace KJS {
 
-PassRefPtr<Profile> Profile::create(const UString& title)
+PassRefPtr<Profile> Profile::create(const UString& title, unsigned uid)
 {
-    return TreeProfile::create(title);
+    return TreeProfile::create(title, uid);
 }
 
-Profile::Profile(const UString& title)
+Profile::Profile(const UString& title, unsigned uid)
     : m_title(title)
+    , m_uid(uid)
 {
     // FIXME: When multi-threading is supported this will be a vector and calls

trunk/JavaScriptCore/profiler/Profile.h

@@ -38 +38 @@
     class Profile : public RefCounted<Profile> {
     public:
-        static PassRefPtr<Profile> create(const UString& title);
+        static PassRefPtr<Profile> create(const UString& title, unsigned uid);
         virtual ~Profile();
 
@@ -45 +45 @@
         void setHead(PassRefPtr<ProfileNode> head) { m_head = head; }
         double totalTime() const { return m_head->totalTime(); }
+        unsigned int uid() const { return m_uid; }
 
         void forEach(void (ProfileNode::*)());
@@ -69 +70 @@
 
     protected:
-        Profile(const UString& title);
+        Profile(const UString& title, unsigned uid);
 
     private:
@@ -77 +78 @@
         UString m_title;
         RefPtr<ProfileNode> m_head;
+        unsigned int m_uid;
     };
 

trunk/JavaScriptCore/profiler/ProfileGenerator.cpp

@@ -34 +34 @@
 static const char* NonJSExecution = "(idle)";
 
-PassRefPtr<ProfileGenerator> ProfileGenerator::create(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client)
+PassRefPtr<ProfileGenerator> ProfileGenerator::create(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client, unsigned uid)
 {
-    return adoptRef(new ProfileGenerator(title, originatingGlobalExec, profileGroup, client));
+    return adoptRef(new ProfileGenerator(title, originatingGlobalExec, profileGroup, client, uid));
 }
 
-ProfileGenerator::ProfileGenerator(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client)
+ProfileGenerator::ProfileGenerator(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient* client, unsigned uid)
     : m_originatingGlobalExec(originatingGlobalExec)
     , m_profileGroup(profileGroup)
@@ -46 +46 @@
     , m_stoppedCallDepth(0)
 {
-    m_profile = Profile::create(title);
+    m_profile = Profile::create(title, uid);
     m_currentNode = m_head = m_profile->head();
 }

trunk/JavaScriptCore/profiler/ProfileGenerator.h

@@ -42 +42 @@
     class ProfileGenerator : public RefCounted<ProfileGenerator>  {
     public:
-        static PassRefPtr<ProfileGenerator> create(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient*);
+        static PassRefPtr<ProfileGenerator> create(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient*, unsigned uid);
 
         // Members
@@ -63 +63 @@
 
     private:
-        ProfileGenerator(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient*);
+        ProfileGenerator(const UString& title, ExecState* originatingGlobalExec, unsigned profileGroup, ProfilerClient*, unsigned uid);
 
         void removeProfileStart();

trunk/JavaScriptCore/profiler/Profiler.cpp

@@ -42 +42 @@
 static const char* GlobalCodeExecution = "(program)";
 static const char* AnonymousFunction = "(anonymous function)";
+static unsigned ProfilesUID = 0;
 
 static CallIdentifier createCallIdentifier(JSObject*);
@@ -71 +72 @@
 
     s_sharedEnabledProfilerReference = this;
-    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, globalExec, exec->lexicalGlobalObject()->profileGroup(), client);
+    RefPtr<ProfileGenerator> profileGenerator = ProfileGenerator::create(title, globalExec, exec->lexicalGlobalObject()->profileGroup(), client, ++ProfilesUID);
     m_currentProfiles.append(profileGenerator);
 }

trunk/JavaScriptCore/profiler/TreeProfile.cpp

@@ -31 +31 @@
 namespace KJS {
 
-PassRefPtr<TreeProfile> TreeProfile::create(const UString& title)
+PassRefPtr<TreeProfile> TreeProfile::create(const UString& title, unsigned uid)
 {
-    return adoptRef(new TreeProfile(title));
+    return adoptRef(new TreeProfile(title, uid));
 }
 
-TreeProfile::TreeProfile(const UString& title)
-    : Profile(title)
+TreeProfile::TreeProfile(const UString& title, unsigned uid)
+    : Profile(title, uid)
 {
 }

trunk/JavaScriptCore/profiler/TreeProfile.h

@@ -38 +38 @@
     class TreeProfile : public Profile {
     public:
-        static PassRefPtr<TreeProfile> create(const UString& title);
+        static PassRefPtr<TreeProfile> create(const UString& title, unsigned uid);
 
         virtual Profile* heavyProfile();
@@ -44 +44 @@
 
     private:
-        TreeProfile(const UString& title);
+        TreeProfile(const UString& title, unsigned uid);
         RefPtr<HeavyProfile> m_heavyProfile;
     };