Changeset 139998 in webkit

Timestamp:

Jan 17, 2013 10:50:59 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Profiler: split "getProfile" to "getCPUProfile" and "loadHeapSnapshot"
​https://bugs.webkit.org/show_bug.cgi?id=104545

Patch by Eugene Klyuchnikov <​eustas@chromium.org> on 2013-01-17
Reviewed by Yury Semikhatsky.

Source/WebCore:

This change will allow stronger typing of profiler output.

• inspector/Inspector.json:

Split "getProfile" to "getCPUProfile" and "getHeapSnapshot".

• inspector/InspectorProfilerAgent.cpp: Ditto.
• inspector/InspectorProfilerAgent.h: Ditto.
• inspector/front-end/CPUProfileView.js: Adopd changes.
• inspector/front-end/HeapSnapshotView.js: Ditto.

Source/WebKit/chromium:

Adopt changes: mimic old behavior.

• src/WebDevToolsAgentImpl.cpp: Adopt signature changes.

Tools:

Adopt signature changes.

• BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/WebInspectorShims.js:

(ProfilerAgent.getCPUProfile): Renamed.
(ProfilerAgent.getHeapSnapshot): Added.

LayoutTests:

Adopted new method signatures.

• inspector/profiler/heap-snapshot-get-profile-crash.html:

Adopted new method signatures.

• inspector/profiler/heap-snapshot-loader.html: Ditto.
• inspector/profiler/heap-snapshot-test.js: Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/profiler/heap-snapshot-get-profile-crash.html (modified) (1 diff)
• LayoutTests/inspector/profiler/heap-snapshot-loader.html (modified) (2 diffs)
• LayoutTests/inspector/profiler/heap-snapshot-test.js (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/Inspector.json (modified) (2 diffs)
• Source/WebCore/inspector/InspectorProfilerAgent.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorProfilerAgent.h (modified) (1 diff)
• Source/WebCore/inspector/front-end/CPUProfileView.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/HeapSnapshotView.js (modified) (2 diffs)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp (modified) (1 diff)
• Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/WebInspectorShims.js (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-17  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        Web Inspector: Profiler: split "getProfile" to "getCPUProfile" and "loadHeapSnapshot"
+        https://bugs.webkit.org/show_bug.cgi?id=104545
+
+        Reviewed by Yury Semikhatsky.
+
+        Adopted new method signatures.
+
+        * inspector/profiler/heap-snapshot-get-profile-crash.html:
+        Adopted new method signatures.
+        * inspector/profiler/heap-snapshot-loader.html: Ditto.
+        * inspector/profiler/heap-snapshot-test.js: Ditto.
+
 2013-01-17  Krzysztof Czech  <k.czech@samsung.com>
 

trunk/LayoutTests/inspector/profiler/heap-snapshot-get-profile-crash.html

@@ -15 +15 @@
                 next();
             }
-            ProfilerAgent.getProfile("HEAP", -1, finish);
+            ProfilerAgent.getHeapSnapshot(-1, finish);
         }
     ]);

trunk/LayoutTests/inspector/profiler/heap-snapshot-loader.html

@@ -31 +31 @@
         var profileHeader = panel._profiles[0];
 
-        function getProfileMock(profileTypeName, uid) {
+        function getHeapSnapshotMock(uid) {
             for (var i = 0, l = sourceStringified.length; i < l; i += partSize)
                 dispatcher.addHeapSnapshotChunk(uid, sourceStringified.slice(i, i + partSize));
@@ -40 +40 @@
         {
             if (overrideGetProfile)
-                InspectorTest.override(ProfilerAgent, "getProfile", getProfileMock);
+                InspectorTest.override(ProfilerAgent, "getHeapSnapshot", getHeapSnapshotMock);
             callback(profileHeader);
         }
         InspectorTest.addSniffer(profileHeader, "_snapshotReceived", snapshotLoaded);
 
-        InspectorTest.override(ProfilerAgent, "getProfile", getProfileMock);
+        InspectorTest.override(ProfilerAgent, "getHeapSnapshot", getHeapSnapshotMock);
         panel.showProfile(profileHeader);
     }

trunk/LayoutTests/inspector/profiler/heap-snapshot-test.js

@@ -728 +728 @@
     });
     delete snapshot.maxJSObjectId;
-    function pushGeneratedSnapshot(typeId, uid)
-    {
-        snapshot.snapshot.typeId = profile.typeId;
+    function pushGeneratedSnapshot(uid)
+    {
+        snapshot.snapshot.typeId = "HEAP";
         snapshot.snapshot.title = profile.title;
         snapshot.snapshot.uid = profile.uid;
@@ -736 +736 @@
         WebInspector.panels.profiles._finishHeapSnapshot(uid);
     }
-    InspectorTest.override(ProfilerAgent, "getProfile", pushGeneratedSnapshot);
+    InspectorTest.override(ProfilerAgent, "getHeapSnapshot", pushGeneratedSnapshot);
     InspectorTest._takeAndOpenSnapshotCallback = callback;
     WebInspector.panels.profiles.addProfileHeader(profile);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-17  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        Web Inspector: Profiler: split "getProfile" to "getCPUProfile" and "loadHeapSnapshot"
+        https://bugs.webkit.org/show_bug.cgi?id=104545
+
+        Reviewed by Yury Semikhatsky.
+
+        This change will allow stronger typing of profiler output.
+
+        * inspector/Inspector.json:
+        Split "getProfile" to "getCPUProfile" and "getHeapSnapshot".
+        * inspector/InspectorProfilerAgent.cpp: Ditto.
+        * inspector/InspectorProfilerAgent.h: Ditto.
+        * inspector/front-end/CPUProfileView.js: Adopd changes.
+        * inspector/front-end/HeapSnapshotView.js: Ditto.
+
 2013-01-17  Eugene Klyuchnikov  <eustas@chromium.org>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -2985 +2985 @@
             },
             {
-                "id": "Profile",
+                "id": "CPUProfile",
                 "type": "object",
                 "description": "Profile.",
@@ -3038 +3038 @@
             },
             {
-                "name": "getProfile",
-                "parameters": [
-                    { "name": "type", "type": "string" },
+                "name": "getCPUProfile",
+                "parameters": [
                     { "name": "uid", "type": "integer" }
                 ],
                 "returns": [
-                    { "name": "profile", "$ref": "Profile" }
+                    { "name": "profile", "$ref": "CPUProfile" }
+                ]
+            },
+            {
+                "name": "getHeapSnapshot",
+                "parameters": [
+                    { "name": "uid", "type": "integer" }
                 ]
             },

trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp

@@ -285 +285 @@
 } // namespace
 
-void InspectorProfilerAgent::getProfile(ErrorString* errorString, const String& type, int rawUid, RefPtr<TypeBuilder::Profiler::Profile>& profileObject)
+void InspectorProfilerAgent::getCPUProfile(ErrorString* errorString, int rawUid, RefPtr<TypeBuilder::Profiler::CPUProfile>& profileObject)
 {
     unsigned uid = static_cast<unsigned>(rawUid);
-    if (type == CPUProfileType) {
-        ProfilesMap::iterator it = m_profiles.find(uid);
-        if (it == m_profiles.end()) {
-            *errorString = "Profile wasn't found";
-            return;
-        }
-        profileObject = TypeBuilder::Profiler::Profile::create();
-        profileObject->setHead(it->value->buildInspectorObjectForHead());
-        if (it->value->bottomUpHead())
-            profileObject->setBottomUpHead(it->value->buildInspectorObjectForBottomUpHead());
-        profileObject->setIdleTime(it->value->idleTime());
-    } else if (type == HeapProfileType) {
-        HeapSnapshotsMap::iterator it = m_snapshots.find(uid);
-        if (it == m_snapshots.end()) {
-            *errorString = "Profile wasn't found";
-            return;
-        }
-        RefPtr<ScriptHeapSnapshot> snapshot = it->value;
-        profileObject = TypeBuilder::Profiler::Profile::create();
-        if (m_frontend) {
-            OutputStream stream(m_frontend, uid);
-            snapshot->writeJSON(&stream);
-        }
+    ProfilesMap::iterator it = m_profiles.find(uid);
+    if (it == m_profiles.end()) {
+        *errorString = "Profile wasn't found";
+        return;
+    }
+    profileObject = TypeBuilder::Profiler::CPUProfile::create();
+    profileObject->setHead(it->value->buildInspectorObjectForHead());
+    if (it->value->bottomUpHead())
+        profileObject->setBottomUpHead(it->value->buildInspectorObjectForBottomUpHead());
+    profileObject->setIdleTime(it->value->idleTime());
+}
+
+void InspectorProfilerAgent::getHeapSnapshot(ErrorString* errorString, int rawUid)
+{
+    unsigned uid = static_cast<unsigned>(rawUid);
+    HeapSnapshotsMap::iterator it = m_snapshots.find(uid);
+    if (it == m_snapshots.end()) {
+        *errorString = "Profile wasn't found";
+        return;
+    }
+    RefPtr<ScriptHeapSnapshot> snapshot = it->value;
+    if (m_frontend) {
+        OutputStream stream(m_frontend, uid);
+        snapshot->writeJSON(&stream);
     }
 }

trunk/Source/WebCore/inspector/InspectorProfilerAgent.h

@@ -88 +88 @@
     String getCurrentUserInitiatedProfileName(bool incrementProfileNumber = false);
     virtual void getProfileHeaders(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::ProfileHeader> >&);
-    virtual void getProfile(ErrorString*, const String& type, int uid, RefPtr<TypeBuilder::Profiler::Profile>&);
+    virtual void getCPUProfile(ErrorString*, int uid, RefPtr<TypeBuilder::Profiler::CPUProfile>&);
+    virtual void getHeapSnapshot(ErrorString*, int uid);
     virtual void removeProfile(ErrorString*, const String& type, int uid);
 

trunk/Source/WebCore/inspector/front-end/CPUProfileView.js

@@ -99 +99 @@
     this._linkifier = new WebInspector.Linkifier(new WebInspector.Linkifier.DefaultFormatter(30));
 
-    ProfilerAgent.getProfile(this.profile.profileType().id, this.profile.uid, profileCallback.bind(this));
+    ProfilerAgent.getCPUProfile(this.profile.uid, profileCallback.bind(this));
 }
 

trunk/Source/WebCore/inspector/front-end/HeapSnapshotView.js

@@ -873 +873 @@
             this.sidebarElement.subtitle = WebInspector.UIString("Loading\u2026");
             this.sidebarElement.wait = true;
-            ProfilerAgent.getProfile(this.profileType().id, this.uid);
+            ProfilerAgent.getHeapSnapshot(this.uid);
         }
         var loaderProxy = /** @type {WebInspector.HeapSnapshotLoaderProxy} */ (this._receiver);
@@ -978 +978 @@
             this._savedChunks = 0;
             this._updateTransferProgress(0, this._totalNumberOfChunks);
-            ProfilerAgent.getProfile(this.profileType().id, this.uid);
+            ProfilerAgent.getHeapSnapshot(this.uid);
         }
         this._savingToFile = true;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-17  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        Web Inspector: Profiler: split "getProfile" to "getCPUProfile" and "loadHeapSnapshot"
+        https://bugs.webkit.org/show_bug.cgi?id=104545
+
+        Reviewed by Yury Semikhatsky.
+
+        Adopt changes: mimic old behavior.
+
+        * src/WebDevToolsAgentImpl.cpp: Adopt signature changes.
+
 2013-01-17  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

@@ -750 +750 @@
         || commandName == InspectorBackendDispatcher::commandNames[InspectorBackendDispatcher::kProfiler_startCmd]
         || commandName == InspectorBackendDispatcher::commandNames[InspectorBackendDispatcher::kProfiler_stopCmd]
-        || commandName == InspectorBackendDispatcher::commandNames[InspectorBackendDispatcher::kProfiler_getProfileCmd];
+        || commandName == InspectorBackendDispatcher::commandNames[InspectorBackendDispatcher::kProfiler_getCPUProfileCmd]
+        || commandName == InspectorBackendDispatcher::commandNames[InspectorBackendDispatcher::kProfiler_getHeapSnapshotCmd];
 }
 

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/WebInspectorShims.js

@@ -69 +69 @@
 
 var ProfilerAgent = {
-    getProfile: function(typeId, uid, callback) {
+    getCPUProfile: function(uid, callback) {
         this._callback = callback;
+    },
+
+    getHeapSnapshot: function(uid, callback) {
     },
 

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-17  Eugene Klyuchnikov  <eustas@chromium.org>
+
+        Web Inspector: Profiler: split "getProfile" to "getCPUProfile" and "loadHeapSnapshot"
+        https://bugs.webkit.org/show_bug.cgi?id=104545
+
+        Reviewed by Yury Semikhatsky.
+
+        Adopt signature changes.
+
+        * BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/WebInspectorShims.js:
+        (ProfilerAgent.getCPUProfile): Renamed.
+        (ProfilerAgent.getHeapSnapshot): Added.
+
 2013-01-17  Zan Dobersek  <zdobersek@igalia.com>