<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[196193] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/196193">196193</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-02-05 15:25:23 -0800 (Fri, 05 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Include SamplingProfiler's expression-level data for stack frames in the protocol
https://bugs.webkit.org/show_bug.cgi?id=153455
<rdar://problem/24335884>
Reviewed by Joseph Pecoraro.
Source/JavaScriptCore:
We now send the sampling profiler's expression-level
line/column info in the inspector protocol.
* inspector/agents/InspectorScriptProfilerAgent.cpp:
(Inspector::buildSamples):
* inspector/protocol/ScriptProfiler.json:
* runtime/SamplingProfiler.h:
(JSC::SamplingProfiler::StackFrame::hasExpressionInfo):
Source/WebInspectorUI:
JSC has been collecting expression-level data in the sampling
profiler, and with this patch, we now get that information
in the inspector. With this information, we probably have
all the data we need to make real heat maps.
* UserInterface/Models/CallingContextTree.js:
(WebInspector.CallingContextTree.prototype.updateTreeWithStackTrace):
(WebInspector.CCTNode):
(WebInspector.CCTNode.prototype.findOrMakeChild):
(WebInspector.CCTNode.prototype.addTimestampAndExpressionLocation):
(WebInspector.CCTNode.prototype.addTimestamp): Deleted.
LayoutTests:
* inspector/sampling-profiler/expression-location-info-expected.txt: Added.
* inspector/sampling-profiler/expression-location-info.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolScriptProfilerjson">trunk/Source/JavaScriptCore/inspector/protocol/ScriptProfiler.json</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSamplingProfilerh">trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCallingContextTreejs">trunk/Source/WebInspectorUI/UserInterface/Models/CallingContextTree.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorsamplingprofilerexpressionlocationinfoexpectedtxt">trunk/LayoutTests/inspector/sampling-profiler/expression-location-info-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorsamplingprofilerexpressionlocationinfohtml">trunk/LayoutTests/inspector/sampling-profiler/expression-location-info.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196192 => 196193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-05 23:16:42 UTC (rev 196192)
+++ trunk/LayoutTests/ChangeLog 2016-02-05 23:25:23 UTC (rev 196193)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-05 Saam barati <sbarati@apple.com>
+
+ Web Inspector: Include SamplingProfiler's expression-level data for stack frames in the protocol
+ https://bugs.webkit.org/show_bug.cgi?id=153455
+ <rdar://problem/24335884>
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/sampling-profiler/expression-location-info-expected.txt: Added.
+ * inspector/sampling-profiler/expression-location-info.html: Added.
+
</ins><span class="cx"> 2016-02-05 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: WebKit hanging when VoiceOver attempts to focus in on page
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorsamplingprofilerexpressionlocationinfoexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/sampling-profiler/expression-location-info-expected.txt (0 => 196193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/sampling-profiler/expression-location-info-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/sampling-profiler/expression-location-info-expected.txt 2016-02-05 23:25:23 UTC (rev 196193)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+
+== Running test suite: ScriptProfiler.Samples.ExpressionLocation
+-- Running test case: Sampling Profiler Expression Location
+PASS: Should have seen line 19, column 14.
+PASS: Should have seen line 25, column 14.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorsamplingprofilerexpressionlocationinfohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/sampling-profiler/expression-location-info.html (0 => 196193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/sampling-profiler/expression-location-info.html (rev 0)
+++ trunk/LayoutTests/inspector/sampling-profiler/expression-location-info.html 2016-02-05 23:25:23 UTC (rev 196193)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="../../http/tests/inspector/resources/protocol-test.js"></script>
+<script>
+
+function runFor(func, millis) {
+ let start = Date.now();
+ do {
+ func();
+ } while (Date.now() - start < millis);
+}
+
+function foo() {
+ {
+ let o = {};
+ for (let i = 0; i < 10000; i++) {
+ o["s" + i] = i; // line 19, column 14("[")
+ }
+ }
+ {
+ let o = {};
+ for (let i = 0; i < 10000; i++) {
+ o["s" + i] = i; // line 25, column 14("[")
+ }
+ }
+}
+noInline(foo);
+
+function test()
+{
+ let suite = ProtocolTest.createAsyncSuite("ScriptProfiler.Samples.ExpressionLocation");
+
+ suite.addTestCase({
+ name: "Sampling Profiler Expression Location",
+ description: "Make sure we properly collect location information.",
+ test: (resolve, reject) => {
+ InspectorProtocol.awaitEvent({event: "ScriptProfiler.trackingComplete"}).then((messageObject) => {
+ let tree = WebInspector.CallingContextTree.__test_makeTreeFromProtocolMessageObject(messageObject);
+ let foundLine19Column14 = false;
+ let foundLine25Column14 = false;
+ tree.forEachNode((node) => {
+ if (node.name !== "foo")
+ return;
+
+ for (let lineColumnHashedString of Object.getOwnPropertyNames(node._expressionLocations)) {
+ let [lineNumber, columnNumber] = lineColumnHashedString.split(":").map(Number);
+ if (lineNumber === 19 && columnNumber === 14)
+ foundLine19Column14 = true;
+ if (lineNumber === 25 && columnNumber === 14)
+ foundLine25Column14 = true;
+ }
+ });
+
+ ProtocolTest.expectThat(foundLine19Column14, "Should have seen line 19, column 14.");
+ ProtocolTest.expectThat(foundLine25Column14, "Should have seen line 25, column 14.");
+ resolve();
+ });
+
+ InspectorProtocol.sendCommand("ScriptProfiler.startTracking", {includeSamples: true});
+ ProtocolTest.evaluateInPage("runFor(foo, 100)");
+ InspectorProtocol.sendCommand('ScriptProfiler.stopTracking', {});
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196192 => 196193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-05 23:16:42 UTC (rev 196192)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-05 23:25:23 UTC (rev 196193)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-02-05 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Include SamplingProfiler's expression-level data for stack frames in the protocol
+ https://bugs.webkit.org/show_bug.cgi?id=153455
+ <rdar://problem/24335884>
+
+ Reviewed by Joseph Pecoraro.
+
+ We now send the sampling profiler's expression-level
+ line/column info in the inspector protocol.
+
+ * inspector/agents/InspectorScriptProfilerAgent.cpp:
+ (Inspector::buildSamples):
+ * inspector/protocol/ScriptProfiler.json:
+ * runtime/SamplingProfiler.h:
+ (JSC::SamplingProfiler::StackFrame::hasExpressionInfo):
+
+2016-02-05 Saam barati <sbarati@apple.com>
+
</ins><span class="cx"> follow-up to: JSC Sampling Profiler: (host) is confusing in cases where I would expect to see JS name
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153663
</span><span class="cx"> <rdar://problem/24415092>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp (196192 => 196193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-02-05 23:16:42 UTC (rev 196192)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-02-05 23:25:23 UTC (rev 196193)
</span><span class="lines">@@ -170,6 +170,15 @@
</span><span class="cx"> .setColumn(stackFrame.functionStartColumn())
</span><span class="cx"> .setUrl(stackFrame.url())
</span><span class="cx"> .release();
</span><ins>+
+ if (stackFrame.hasExpressionInfo()) {
+ Ref<Protocol::ScriptProfiler::ExpressionLocation> expressionLocation = Protocol::ScriptProfiler::ExpressionLocation::create()
+ .setLine(stackFrame.lineNumber)
+ .setColumn(stackFrame.columnNumber)
+ .release();
+ frame->setExpressionLocation(WTFMove(expressionLocation));
+ }
+
</ins><span class="cx"> frames->addItem(WTFMove(frame));
</span><span class="cx"> }
</span><span class="cx"> Ref<Protocol::ScriptProfiler::StackTrace> inspectorStackTrace = Protocol::ScriptProfiler::StackTrace::create()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolScriptProfilerjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/ScriptProfiler.json (196192 => 196193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/ScriptProfiler.json 2016-02-05 23:16:42 UTC (rev 196192)
+++ trunk/Source/JavaScriptCore/inspector/protocol/ScriptProfiler.json 2016-02-05 23:25:23 UTC (rev 196193)
</span><span class="lines">@@ -17,6 +17,14 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "id": "ExpressionLocation",
+ "type": "object",
+ "properties": [
+ { "name": "line", "type": "integer" },
+ { "name": "column", "type": "integer" }
+ ]
+ },
+ {
</ins><span class="cx"> "id": "StackFrame",
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="lines">@@ -24,7 +32,8 @@
</span><span class="cx"> { "name": "name", "type": "string", "description": "A displayable name for the stack frame. i.e function name, (program), etc." },
</span><span class="cx"> { "name": "line", "type": "integer" },
</span><span class="cx"> { "name": "column", "type": "integer" },
</span><del>- { "name": "url", "type": "string" }
</del><ins>+ { "name": "url", "type": "string" },
+ { "name": "expressionLocation", "$ref": "ExpressionLocation", "optional": true }
</ins><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSamplingProfilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h (196192 => 196193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h 2016-02-05 23:16:42 UTC (rev 196192)
+++ trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h 2016-02-05 23:25:23 UTC (rev 196193)
</span><span class="lines">@@ -84,6 +84,12 @@
</span><span class="cx"> unsigned lineNumber { std::numeric_limits<unsigned>::max() };
</span><span class="cx"> unsigned columnNumber { std::numeric_limits<unsigned>::max() };
</span><span class="cx">
</span><ins>+ bool hasExpressionInfo() const
+ {
+ return lineNumber != std::numeric_limits<unsigned>::max()
+ && columnNumber != std::numeric_limits<unsigned>::max();
+ }
+
</ins><span class="cx"> // These are function-level data.
</span><span class="cx"> String nameFromCallee(VM&);
</span><span class="cx"> String displayName(VM&);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (196192 => 196193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-02-05 23:16:42 UTC (rev 196192)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-02-05 23:25:23 UTC (rev 196193)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-02-05 Saam barati <sbarati@apple.com>
+
+ Web Inspector: Include SamplingProfiler's expression-level data for stack frames in the protocol
+ https://bugs.webkit.org/show_bug.cgi?id=153455
+ <rdar://problem/24335884>
+
+ Reviewed by Joseph Pecoraro.
+
+ JSC has been collecting expression-level data in the sampling
+ profiler, and with this patch, we now get that information
+ in the inspector. With this information, we probably have
+ all the data we need to make real heat maps.
+
+ * UserInterface/Models/CallingContextTree.js:
+ (WebInspector.CallingContextTree.prototype.updateTreeWithStackTrace):
+ (WebInspector.CCTNode):
+ (WebInspector.CCTNode.prototype.findOrMakeChild):
+ (WebInspector.CCTNode.prototype.addTimestampAndExpressionLocation):
+ (WebInspector.CCTNode.prototype.addTimestamp): Deleted.
+
</ins><span class="cx"> 2016-02-05 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Navigation bar in sidebars should always fit on a single line
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCallingContextTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CallingContextTree.js (196192 => 196193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CallingContextTree.js 2016-02-05 23:16:42 UTC (rev 196192)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CallingContextTree.js 2016-02-05 23:25:23 UTC (rev 196193)
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> {
</span><span class="cx"> this._totalNumberOfSamples++;
</span><span class="cx"> let node = this._root;
</span><del>- node.addTimestamp(timestamp);
</del><ins>+ node.addTimestampAndExpressionLocation(timestamp, null);
</ins><span class="cx"> for (let i = stackFrames.length; i--; ) {
</span><span class="cx"> let stackFrame = stackFrames[i];
</span><span class="cx"> node = node.findOrMakeChild(stackFrame);
</span><del>- node.addTimestamp(timestamp);
</del><ins>+ node.addTimestampAndExpressionLocation(timestamp, stackFrame.expressionLocation || null);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -126,8 +126,10 @@
</span><span class="cx"> this._column = column;
</span><span class="cx"> this._name = name;
</span><span class="cx"> this._url = url;
</span><ins>+ this._uid = WebInspector.CCTNode.__uid++;
+
</ins><span class="cx"> this._timestamps = [];
</span><del>- this._uid = WebInspector.CCTNode.__uid++;
</del><ins>+ this._expressionLocations = {}; // Keys are "line:column" strings. Values are arrays of timestamps in sorted order.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Static and Private
</span><span class="lines">@@ -196,10 +198,23 @@
</span><span class="cx"> return node;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- addTimestamp(timestamp)
</del><ins>+ addTimestampAndExpressionLocation(timestamp, expressionLocation)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this._timestamps.length || this._timestamps.lastValue <= timestamp, "Expected timestamps to be added in sorted, increasing, order.");
</span><span class="cx"> this._timestamps.push(timestamp);
</span><ins>+
+ if (!expressionLocation)
+ return;
+
+ let {line, column} = expressionLocation;
+ let hashCons = line + ":" + column;
+ let timestamps = this._expressionLocations[hashCons];
+ if (!timestamps) {
+ timestamps = [];
+ this._expressionLocations[hashCons] = timestamps;
+ }
+ console.assert(!timestamps.length || timestamps.lastValue <= timestamp, "Expected timestamps to be added in sorted, increasing, order.");
+ timestamps.push(timestamp);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> forEachChild(callback)
</span></span></pre>
</div>
</div>
</body>
</html>