Title: [141273] trunk/Source/WebCore
Revision
141273
Author
[email protected]
Date
2013-01-30 08:15:38 -0800 (Wed, 30 Jan 2013)

Log Message

Web Inspector: Script Profiler: Make profiler output typed.
https://bugs.webkit.org/show_bug.cgi?id=102792

Patch by Eugene Klyuchnikov <[email protected]> on 2013-01-30
Reviewed by Yury Semikhatsky.

Currently fields "head" and "bottomUpHead" of Profile object
returned by Profiler.getCPUProfile is untyped (type = object).

That's not good both for client side (protocol users may
only guess on output content) and backend side (field names
are hardcoded in source code).

This patch defines "head" and "bottomUpHead" to be of new
"CPUProfileNode" type and updates serialization code to use
builders to create output.

* bindings/js/ScriptProfile.cpp: Used buiders for serialization.
* bindings/js/ScriptProfile.h: Ditto.
* bindings/v8/ScriptProfile.cpp: Ditto.
* bindings/v8/ScriptProfile.h: Ditto.
* inspector/Inspector.json: Added and used new ProfileNode type.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (141272 => 141273)


--- trunk/Source/WebCore/ChangeLog	2013-01-30 16:12:32 UTC (rev 141272)
+++ trunk/Source/WebCore/ChangeLog	2013-01-30 16:15:38 UTC (rev 141273)
@@ -1,3 +1,27 @@
+2013-01-30  Eugene Klyuchnikov  <[email protected]>
+
+        Web Inspector: Script Profiler: Make profiler output typed.
+        https://bugs.webkit.org/show_bug.cgi?id=102792
+
+        Reviewed by Yury Semikhatsky.
+
+        Currently fields "head" and "bottomUpHead" of Profile object
+        returned by Profiler.getCPUProfile is untyped (type = object).
+
+        That's not good both for client side (protocol users may
+        only guess on output content) and backend side (field names
+        are hardcoded in source code).
+
+        This patch defines "head" and "bottomUpHead" to be of new
+        "CPUProfileNode" type and updates serialization code to use
+        builders to create output.
+
+        * bindings/js/ScriptProfile.cpp: Used buiders for serialization.
+        * bindings/js/ScriptProfile.h: Ditto.
+        * bindings/v8/ScriptProfile.cpp: Ditto.
+        * bindings/v8/ScriptProfile.h: Ditto.
+        * inspector/Inspector.json: Added and used new ProfileNode type.
+
 2013-01-30  Yury Semikhatsky  <[email protected]>
 
         Web Inspector: remove NativeHeapGraph.js

Modified: trunk/Source/WebCore/bindings/js/ScriptProfile.cpp (141272 => 141273)


--- trunk/Source/WebCore/bindings/js/ScriptProfile.cpp	2013-01-30 16:12:32 UTC (rev 141272)
+++ trunk/Source/WebCore/bindings/js/ScriptProfile.cpp	2013-01-30 16:15:38 UTC (rev 141273)
@@ -81,36 +81,34 @@
 }
 
 #if ENABLE(INSPECTOR)
-static PassRefPtr<InspectorObject> buildInspectorObjectFor(const JSC::ProfileNode* node)
+static PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObjectFor(const JSC::ProfileNode* node)
 {
-    RefPtr<InspectorObject> result = InspectorObject::create();
-
-    result->setString("functionName", node->functionName());
-    result->setString("url", node->url());
-    result->setNumber("lineNumber", node->lineNumber());
-    result->setNumber("totalTime", node->totalTime());
-    result->setNumber("selfTime", node->selfTime());
-    result->setNumber("numberOfCalls", node->numberOfCalls());
-    result->setBoolean("visible", node->visible());
-    result->setNumber("callUID", node->callIdentifier().hash());
-
-    RefPtr<InspectorArray> childrenArray = InspectorArray::create();
     typedef Vector<RefPtr<JSC::ProfileNode> > ProfileNodesList;
-    const ProfileNodesList& children = node->children();
-    ProfileNodesList::const_iterator end = children.end();
-    for (ProfileNodesList::const_iterator iter = children.begin(); iter != end; ++iter)
-        childrenArray->pushObject(buildInspectorObjectFor(iter->get()));
-    result->setArray("children", childrenArray);
+    const ProfileNodesList& nodeChildren = node->children();
+    ProfileNodesList::const_iterator end = nodeChildren.end();
+    RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode> > children = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create();
+    for (ProfileNodesList::const_iterator iter = nodeChildren.begin(); iter != end; ++iter)
+        children->addItem(buildInspectorObjectFor(iter->get()));
 
-    return result;
+    RefPtr<TypeBuilder::Profiler::CPUProfileNode> result = TypeBuilder::Profiler::CPUProfileNode::create()
+        .setFunctionName(node->functionName())
+        .setUrl(node->url())
+        .setLineNumber(node->lineNumber())
+        .setTotalTime(node->totalTime())
+        .setSelfTime(node->selfTime())
+        .setNumberOfCalls(node->numberOfCalls())
+        .setVisible(node->visible())
+        .setCallUID(node->callIdentifier().hash())
+        .setChildren(children.release());
+    return result.release();
 }
 
-PassRefPtr<InspectorObject> ScriptProfile::buildInspectorObjectForHead() const
+PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> ScriptProfile::buildInspectorObjectForHead() const
 {
     return buildInspectorObjectFor(m_profile->head());
 }
 
-PassRefPtr<InspectorObject> ScriptProfile::buildInspectorObjectForBottomUpHead() const
+PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> ScriptProfile::buildInspectorObjectForBottomUpHead() const
 {
     return 0;
 }

Modified: trunk/Source/WebCore/bindings/js/ScriptProfile.h (141272 => 141273)


--- trunk/Source/WebCore/bindings/js/ScriptProfile.h	2013-01-30 16:12:32 UTC (rev 141272)
+++ trunk/Source/WebCore/bindings/js/ScriptProfile.h	2013-01-30 16:15:38 UTC (rev 141273)
@@ -34,6 +34,10 @@
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
+#if ENABLE(INSPECTOR)
+#include "InspectorTypeBuilder.h"
+#endif
+
 namespace JSC {
 class Profile;
 }
@@ -54,8 +58,8 @@
     double idleTime() const;
 
 #if ENABLE(INSPECTOR)
-    PassRefPtr<InspectorObject> buildInspectorObjectForHead() const;
-    PassRefPtr<InspectorObject> buildInspectorObjectForBottomUpHead() const;
+    PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObjectForHead() const;
+    PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObjectForBottomUpHead() const;
 #endif
 
 private:

Modified: trunk/Source/WebCore/bindings/v8/ScriptProfile.cpp (141272 => 141273)


--- trunk/Source/WebCore/bindings/v8/ScriptProfile.cpp	2013-01-30 16:12:32 UTC (rev 141272)
+++ trunk/Source/WebCore/bindings/v8/ScriptProfile.cpp	2013-01-30 16:15:38 UTC (rev 141273)
@@ -71,35 +71,36 @@
 }
 
 #if ENABLE(INSPECTOR)
-static PassRefPtr<InspectorObject> buildInspectorObjectFor(const v8::CpuProfileNode* node)
+static PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObjectFor(const v8::CpuProfileNode* node)
 {
     v8::HandleScope handleScope;
-    RefPtr<InspectorObject> result = InspectorObject::create();
-    result->setString("functionName", toWebCoreString(node->GetFunctionName()));
-    result->setString("url", toWebCoreString(node->GetScriptResourceName()));
-    result->setNumber("lineNumber", node->GetLineNumber());
-    result->setNumber("totalTime", node->GetTotalTime());
-    result->setNumber("selfTime", node->GetSelfTime());
-    result->setNumber("numberOfCalls", 0);
-    result->setBoolean("visible", true);
-    result->setNumber("callUID", node->GetCallUid());
 
-    RefPtr<InspectorArray> children = InspectorArray::create();
+    RefPtr<TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode> > children = TypeBuilder::Array<TypeBuilder::Profiler::CPUProfileNode>::create();
     const int childrenCount = node->GetChildrenCount();
     for (int i = 0; i < childrenCount; i++) {
         const v8::CpuProfileNode* child = node->GetChild(i);
-        children->pushObject(buildInspectorObjectFor(child));
+        children->addItem(buildInspectorObjectFor(child));
     }
-    result->setArray("children", children);
+
+    RefPtr<TypeBuilder::Profiler::CPUProfileNode> result = TypeBuilder::Profiler::CPUProfileNode::create()
+        .setFunctionName(toWebCoreString(node->GetFunctionName()))
+        .setUrl(toWebCoreString(node->GetScriptResourceName()))
+        .setLineNumber(node->GetLineNumber())
+        .setTotalTime(node->GetTotalTime())
+        .setSelfTime(node->GetSelfTime())
+        .setNumberOfCalls(0)
+        .setVisible(true)
+        .setCallUID(node->GetCallUid())
+        .setChildren(children.release());
     return result.release();
 }
 
-PassRefPtr<InspectorObject> ScriptProfile::buildInspectorObjectForHead() const
+PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> ScriptProfile::buildInspectorObjectForHead() const
 {
     return buildInspectorObjectFor(m_profile->GetTopDownRoot());
 }
 
-PassRefPtr<InspectorObject> ScriptProfile::buildInspectorObjectForBottomUpHead() const
+PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> ScriptProfile::buildInspectorObjectForBottomUpHead() const
 {
     return buildInspectorObjectFor(m_profile->GetBottomUpRoot());
 }

Modified: trunk/Source/WebCore/bindings/v8/ScriptProfile.h (141272 => 141273)


--- trunk/Source/WebCore/bindings/v8/ScriptProfile.h	2013-01-30 16:12:32 UTC (rev 141272)
+++ trunk/Source/WebCore/bindings/v8/ScriptProfile.h	2013-01-30 16:15:38 UTC (rev 141273)
@@ -35,6 +35,10 @@
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
 
+#if ENABLE(INSPECTOR)
+#include "InspectorTypeBuilder.h"
+#endif
+
 namespace v8 {
 class CpuProfile;
 }
@@ -60,8 +64,8 @@
     double idleTime() const;
 
 #if ENABLE(INSPECTOR)
-    PassRefPtr<InspectorObject> buildInspectorObjectForHead() const;
-    PassRefPtr<InspectorObject> buildInspectorObjectForBottomUpHead() const;
+    PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObjectForHead() const;
+    PassRefPtr<TypeBuilder::Profiler::CPUProfileNode> buildInspectorObjectForBottomUpHead() const;
 #endif
 
 private:

Modified: trunk/Source/WebCore/inspector/Inspector.json (141272 => 141273)


--- trunk/Source/WebCore/inspector/Inspector.json	2013-01-30 16:12:32 UTC (rev 141272)
+++ trunk/Source/WebCore/inspector/Inspector.json	2013-01-30 16:15:38 UTC (rev 141273)
@@ -3033,12 +3033,28 @@
                 ]
             },
             {
+                "id": "CPUProfileNode",
+                "type": "object",
+                "description": "CPU Profile node. Holds callsite information, execution statistics and child nodes.",
+                "properties": [
+                    { "name": "functionName", "type": "string", "description": "Function name." },
+                    { "name": "url", "type": "string", "description": "URL." },
+                    { "name": "lineNumber", "type": "integer", "description": "Line number." },
+                    { "name": "totalTime", "type": "number", "description": "Total execution time." },
+                    { "name": "selfTime", "type": "number", "description": "Self time." },
+                    { "name": "numberOfCalls", "type": "integer", "description": "Number of calls." },
+                    { "name": "visible", "type": "boolean", "description": "Visibility." },
+                    { "name": "callUID", "type": "number", "description": "Call UID." },
+                    { "name": "children", "type": "array", "items": { "$ref": "CPUProfileNode" }, "description": "Child nodes." }
+                ]
+            },
+            {
                 "id": "CPUProfile",
                 "type": "object",
                 "description": "Profile.",
                 "properties": [
-                    { "name": "head", "type": "object", "optional": true },
-                    { "name": "bottomUpHead", "type": "object", "optional": true },
+                    { "name": "head", "$ref": "CPUProfileNode", "optional": true },
+                    { "name": "bottomUpHead", "$ref": "CPUProfileNode", "optional": true },
                     { "name": "idleTime", "type": "number", "optional": true }
                 ]
             },
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to