<!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>[198159] trunk/Source</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/198159">198159</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-14 14:50:20 -0700 (Mon, 14 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reduce generated JSON HeapSnapshot size
https://bugs.webkit.org/show_bug.cgi?id=155460
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-03-14
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Adjust the HeapSnapshot JSON to better reduce its size.
Changes include:
- avoid inner array groups and instead just have a large array for
nodes/edges. This removes lots of small array allocations.
- eliminate duplicate edges
- avoid duplicating edge names by including them in their own table;
- now both the nodes and edges lists hold only integers
* heap/HeapSnapshotBuilder.cpp:
(JSC::HeapSnapshotBuilder::json):
Add some more documentation for the slightly modified format.
While generating, clear data structures as early as possible.
* heap/HeapSnapshotBuilder.h:
(JSC::HeapSnapshotEdge::HeapSnapshotEdge):
During JSON building, the edge's cell pointers are converted to the
identifier they point to. This avoids having to re-lookup the identifier.
* tests/heapProfiler/driver/driver.js:
(CheapHeapSnapshotEdge):
(CheapHeapSnapshot):
(CheapHeapSnapshot.prototype.edgeNameFromTableIndex):
(HeapSnapshot):
Update test driver for slightly different snapshot format.
Source/WebInspectorUI:
* UserInterface/Models/HeapSnapshot.js:
(WebInspector.HeapSnapshot.fromPayload):
Update for the slightly modified format.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapSnapshotBuildercpp">trunk/Source/JavaScriptCore/heap/HeapSnapshotBuilder.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapSnapshotBuilderh">trunk/Source/JavaScriptCore/heap/HeapSnapshotBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsheapProfilerdriverdriverjs">trunk/Source/JavaScriptCore/tests/heapProfiler/driver/driver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsHeapSnapshotjs">trunk/Source/WebInspectorUI/UserInterface/Models/HeapSnapshot.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198158 => 198159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-14 21:44:27 UTC (rev 198158)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-14 21:50:20 UTC (rev 198159)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-03-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Reduce generated JSON HeapSnapshot size
+ https://bugs.webkit.org/show_bug.cgi?id=155460
+
+ Reviewed by Geoffrey Garen.
+
+ Adjust the HeapSnapshot JSON to better reduce its size.
+ Changes include:
+
+ - avoid inner array groups and instead just have a large array for
+ nodes/edges. This removes lots of small array allocations.
+ - eliminate duplicate edges
+ - avoid duplicating edge names by including them in their own table;
+ - now both the nodes and edges lists hold only integers
+
+ * heap/HeapSnapshotBuilder.cpp:
+ (JSC::HeapSnapshotBuilder::json):
+ Add some more documentation for the slightly modified format.
+ While generating, clear data structures as early as possible.
+
+ * heap/HeapSnapshotBuilder.h:
+ (JSC::HeapSnapshotEdge::HeapSnapshotEdge):
+ During JSON building, the edge's cell pointers are converted to the
+ identifier they point to. This avoids having to re-lookup the identifier.
+
+ * tests/heapProfiler/driver/driver.js:
+ (CheapHeapSnapshotEdge):
+ (CheapHeapSnapshot):
+ (CheapHeapSnapshot.prototype.edgeNameFromTableIndex):
+ (HeapSnapshot):
+ Update test driver for slightly different snapshot format.
+
</ins><span class="cx"> 2016-03-14 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> We should be able to eliminate cloned arguments objects that use the length property
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapSnapshotBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapSnapshotBuilder.cpp (198158 => 198159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapSnapshotBuilder.cpp 2016-03-14 21:44:27 UTC (rev 198158)
+++ trunk/Source/JavaScriptCore/heap/HeapSnapshotBuilder.cpp 2016-03-14 21:50:20 UTC (rev 198159)
</span><span class="lines">@@ -133,22 +133,41 @@
</span><span class="cx"> // {
</span><span class="cx"> // "version": 1.0,
</span><span class="cx"> // "nodes": [
</span><del>-// [<nodeId>, <sizeInBytes>, <nodeClassNameIndex>, <optionalInternal>], ...
</del><ins>+// <nodeId>, <sizeInBytes>, <nodeClassNameIndex>, <internal>,
+// <nodeId>, <sizeInBytes>, <nodeClassNameIndex>, <internal>,
+// ...
</ins><span class="cx"> // ],
</span><span class="cx"> // "nodeClassNames": [
</span><span class="cx"> // "string", "Structure", "Object", ...
</span><span class="cx"> // ],
</span><span class="cx"> // "edges": [
</span><del>-// [<fromNodeId>, <toNodeId>, <edgeTypeIndex>, <optionalEdgeExtraData>], ...
</del><ins>+// <fromNodeId>, <toNodeId>, <edgeTypeIndex>, <edgeExtraData>,
+// <fromNodeId>, <toNodeId>, <edgeTypeIndex>, <edgeExtraData>,
+// ...
</ins><span class="cx"> // ],
</span><span class="cx"> // "edgeTypes": [
</span><span class="cx"> // "Internal", "Property", "Index", "Variable"
</span><ins>+// ],
+// "edgeNames": [
+// "propertyName", "variableName", ...
</ins><span class="cx"> // ]
</span><span class="cx"> // }
</span><span class="cx"> //
</span><del>-// FIXME: Possible compaction improvements:
-// - eliminate inner array groups and just have a single list with fixed group sizes (meta data section).
-// - eliminate duplicate edge extra data strings, have an index into a de-duplicated like edgeTypes / nodeClassNames.
</del><ins>+// Notes:
+//
+// <nodeClassNameIndex>
+// - index into the "nodeClassNames" list.
+//
+// <internal>
+// - 0 = false, 1 = true.
+//
+// <edgeTypeIndex>
+// - index into the "edgeTypes" list.
+//
+// <edgeExtraData>
+// - for Internal edges this should be ignored (0).
+// - for Index edges this is the index value.
+// - for Property or Variable edges this is an index into the "edgeNames" list.
</ins><span class="cx">
</span><span class="cx"> static uint8_t edgeTypeToNumber(EdgeType type)
</span><span class="cx"> {
</span><span class="lines">@@ -186,8 +205,13 @@
</span><span class="cx">
</span><span class="cx"> // Build a list of used class names.
</span><span class="cx"> HashMap<const char*, unsigned> classNameIndexes;
</span><del>- unsigned nextClassNameIndex = 0;
</del><ins>+ classNameIndexes.set("<root>", 0);
+ unsigned nextClassNameIndex = 1;
</ins><span class="cx">
</span><ins>+ // Build a list of used edge names.
+ HashMap<UniquedStringImpl*, unsigned> edgeNameIndexes;
+ unsigned nextEdgeNameIndex = 0;
+
</ins><span class="cx"> StringBuilder json;
</span><span class="cx">
</span><span class="cx"> auto appendNodeJSON = [&] (const HeapSnapshotNode& node) {
</span><span class="lines">@@ -208,64 +232,48 @@
</span><span class="cx"> isInternal = !structure || !structure->globalObject();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // [<nodeId>, <sizeInBytes>, <className>, <optionalInternalBoolean>]
</del><ins>+ // <nodeId>, <sizeInBytes>, <className>, <optionalInternalBoolean>
</ins><span class="cx"> json.append(',');
</span><del>- json.append('[');
</del><span class="cx"> json.appendNumber(node.identifier);
</span><span class="cx"> json.append(',');
</span><span class="cx"> json.appendNumber(node.cell->estimatedSizeInBytes());
</span><span class="cx"> json.append(',');
</span><span class="cx"> json.appendNumber(classNameIndex);
</span><del>- if (isInternal)
- json.appendLiteral(",1");
- json.append(']');
</del><ins>+ json.append(',');
+ json.append(isInternal ? '1' : '0');
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool firstEdge = true;
</span><span class="cx"> auto appendEdgeJSON = [&] (const HeapSnapshotEdge& edge) {
</span><del>- // If the from cell is null, this means a root edge.
- unsigned fromIdentifier = 0;
- if (edge.from) {
- auto fromLookup = allowedNodeIdentifiers.find(edge.from);
- if (fromLookup == allowedNodeIdentifiers.end())
- return;
- fromIdentifier = fromLookup->value;
- }
-
- unsigned toIdentifier = 0;
- if (edge.to) {
- auto toLookup = allowedNodeIdentifiers.find(edge.to);
- if (toLookup == allowedNodeIdentifiers.end())
- return;
- toIdentifier = toLookup->value;
- }
-
</del><span class="cx"> if (!firstEdge)
</span><span class="cx"> json.append(',');
</span><span class="cx"> firstEdge = false;
</span><span class="cx">
</span><del>- // [<fromNodeId>, <toNodeId>, <edgeTypeIndex>, <optionalEdgeExtraData>],
- json.append('[');
- json.appendNumber(fromIdentifier);
</del><ins>+ // <fromNodeId>, <toNodeId>, <edgeTypeIndex>, <edgeExtraData>
+ json.appendNumber(edge.from.identifier);
</ins><span class="cx"> json.append(',');
</span><del>- json.appendNumber(toIdentifier);
</del><ins>+ json.appendNumber(edge.to.identifier);
</ins><span class="cx"> json.append(',');
</span><span class="cx"> json.appendNumber(edgeTypeToNumber(edge.type));
</span><ins>+ json.append(',');
</ins><span class="cx"> switch (edge.type) {
</span><span class="cx"> case EdgeType::Property:
</span><del>- case EdgeType::Variable:
- json.append(',');
- json.appendQuotedJSONString(edge.u.name);
</del><ins>+ case EdgeType::Variable: {
+ auto result = edgeNameIndexes.add(edge.u.name, nextEdgeNameIndex);
+ if (result.isNewEntry)
+ nextEdgeNameIndex++;
+ unsigned edgeNameIndex = result.iterator->value;
+ json.appendNumber(edgeNameIndex);
</ins><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case EdgeType::Index:
</span><del>- json.append(',');
</del><span class="cx"> json.appendNumber(edge.u.index);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> // No data for this edge type.
</span><ins>+ json.append('0');
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>- json.append(']');
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> json.append('{');
</span><span class="lines">@@ -277,7 +285,7 @@
</span><span class="cx"> json.append(',');
</span><span class="cx"> json.appendLiteral("\"nodes\":");
</span><span class="cx"> json.append('[');
</span><del>- json.appendLiteral("[0,0,\"<root>\"]");
</del><ins>+ json.appendLiteral("0,0,0,0"); // <root>
</ins><span class="cx"> for (HeapSnapshot* snapshot = m_profiler.mostRecentSnapshot(); snapshot; snapshot = snapshot->previous()) {
</span><span class="cx"> for (auto& node : snapshot->m_nodes)
</span><span class="cx"> appendNodeJSON(node);
</span><span class="lines">@@ -291,6 +299,7 @@
</span><span class="cx"> Vector<const char *> orderedClassNames(classNameIndexes.size());
</span><span class="cx"> for (auto& entry : classNameIndexes)
</span><span class="cx"> orderedClassNames[entry.value] = entry.key;
</span><ins>+ classNameIndexes.clear();
</ins><span class="cx"> bool firstClassName = true;
</span><span class="cx"> for (auto& className : orderedClassNames) {
</span><span class="cx"> if (!firstClassName)
</span><span class="lines">@@ -298,8 +307,42 @@
</span><span class="cx"> firstClassName = false;
</span><span class="cx"> json.appendQuotedJSONString(className);
</span><span class="cx"> }
</span><ins>+ orderedClassNames.clear();
</ins><span class="cx"> json.append(']');
</span><span class="cx">
</span><ins>+ // Process edges.
+ // Replace pointers with identifiers.
+ // Remove any edges that we won't need.
+ m_edges.removeAllMatching([&] (HeapSnapshotEdge& edge) {
+ // If the from cell is null, this means a <root> edge.
+ if (!edge.from.cell)
+ edge.from.identifier = 0;
+ else {
+ auto fromLookup = allowedNodeIdentifiers.find(edge.from.cell);
+ if (fromLookup == allowedNodeIdentifiers.end())
+ return true;
+ edge.from.identifier = fromLookup->value;
+ }
+
+ if (!edge.to.cell)
+ edge.to.identifier = 0;
+ else {
+ auto toLookup = allowedNodeIdentifiers.find(edge.to.cell);
+ if (toLookup == allowedNodeIdentifiers.end())
+ return true;
+ edge.to.identifier = toLookup->value;
+ }
+
+ return false;
+ });
+ allowedNodeIdentifiers.clear();
+ m_edges.shrinkToFit();
+
+ // Sort edges based on from identifier.
+ std::sort(m_edges.begin(), m_edges.end(), [&] (const HeapSnapshotEdge& a, const HeapSnapshotEdge& b) {
+ return a.from.identifier < b.from.identifier;
+ });
+
</ins><span class="cx"> // edges
</span><span class="cx"> json.append(',');
</span><span class="cx"> json.appendLiteral("\"edges\":");
</span><span class="lines">@@ -321,6 +364,24 @@
</span><span class="cx"> json.appendQuotedJSONString(edgeTypeToString(EdgeType::Variable));
</span><span class="cx"> json.append(']');
</span><span class="cx">
</span><ins>+ // edge names
+ json.append(',');
+ json.appendLiteral("\"edgeNames\":");
+ json.append('[');
+ Vector<UniquedStringImpl*> orderedEdgeNames(edgeNameIndexes.size());
+ for (auto& entry : edgeNameIndexes)
+ orderedEdgeNames[entry.value] = entry.key;
+ edgeNameIndexes.clear();
+ bool firstEdgeName = true;
+ for (auto& edgeName : orderedEdgeNames) {
+ if (!firstEdgeName)
+ json.append(',');
+ firstEdgeName = false;
+ json.appendQuotedJSONString(edgeName);
+ }
+ orderedEdgeNames.clear();
+ json.append(']');
+
</ins><span class="cx"> json.append('}');
</span><span class="cx"> return json.toString();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapSnapshotBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapSnapshotBuilder.h (198158 => 198159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapSnapshotBuilder.h 2016-03-14 21:44:27 UTC (rev 198158)
+++ trunk/Source/JavaScriptCore/heap/HeapSnapshotBuilder.h 2016-03-14 21:50:20 UTC (rev 198159)
</span><span class="lines">@@ -57,36 +57,46 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct HeapSnapshotEdge {
</span><del>- HeapSnapshotEdge(JSCell* from, JSCell* to)
- : from(from)
- , to(to)
- , type(EdgeType::Internal)
- { }
</del><ins>+ HeapSnapshotEdge(JSCell* fromCell, JSCell* toCell)
+ : type(EdgeType::Internal)
+ {
+ from.cell = fromCell;
+ to.cell = toCell;
+ }
</ins><span class="cx">
</span><del>- HeapSnapshotEdge(JSCell* from, JSCell* to, EdgeType type, UniquedStringImpl* name)
- : from(from)
- , to(to)
- , type(type)
</del><ins>+ HeapSnapshotEdge(JSCell* fromCell, JSCell* toCell, EdgeType type, UniquedStringImpl* name)
+ : type(type)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(type == EdgeType::Property || type == EdgeType::Variable);
</span><ins>+ from.cell = fromCell;
+ to.cell = toCell;
</ins><span class="cx"> u.name = name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- HeapSnapshotEdge(JSCell* from, JSCell* to, uint32_t index)
- : from(from)
- , to(to)
- , type(EdgeType::Index)
</del><ins>+ HeapSnapshotEdge(JSCell* fromCell, JSCell* toCell, uint32_t index)
+ : type(EdgeType::Index)
</ins><span class="cx"> {
</span><ins>+ from.cell = fromCell;
+ to.cell = toCell;
</ins><span class="cx"> u.index = index;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSCell* from;
- JSCell* to;
- EdgeType type;
</del><span class="cx"> union {
</span><ins>+ JSCell *cell;
+ unsigned identifier;
+ } from;
+
+ union {
+ JSCell *cell;
+ unsigned identifier;
+ } to;
+
+ union {
</ins><span class="cx"> UniquedStringImpl* name;
</span><span class="cx"> uint32_t index;
</span><span class="cx"> } u;
</span><ins>+
+ EdgeType type;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE HeapSnapshotBuilder {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsheapProfilerdriverdriverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/heapProfiler/driver/driver.js (198158 => 198159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/heapProfiler/driver/driver.js 2016-03-14 21:44:27 UTC (rev 198158)
+++ trunk/Source/JavaScriptCore/tests/heapProfiler/driver/driver.js 2016-03-14 21:50:20 UTC (rev 198159)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> const nodeFirstEdgeOffset = 4;
</span><span class="cx"> const nodeNoEdgeValue = 0xffffffff; // UINT_MAX
</span><span class="cx">
</span><del>-// [<0:from-id>, <1:to-id>, <2:typeTableIndex>, <3:data>]
</del><ins>+// [<0:fromId>, <1:toId>, <2:typeTableIndex>, <3:edgeDataIndexOrEdgeNameIndex>]
</ins><span class="cx"> const edgeFieldCount = 4;
</span><span class="cx"> const edgeFromIdOffset = 0;
</span><span class="cx"> const edgeToIdOffset = 1;
</span><span class="lines">@@ -60,7 +60,11 @@
</span><span class="cx"> this.fromId = edges[edgeIndex + edgeFromIdOffset];
</span><span class="cx"> this.toId = edges[edgeIndex + edgeToIdOffset];
</span><span class="cx"> this.type = snapshot.edgeTypeFromTableIndex(edges[edgeIndex + edgeTypeOffset]);
</span><del>- this.data = edges[edgeIndex + edgeDataOffset];
</del><ins>+
+ if (this.type === "Property" || this.type === "Variable")
+ this.data = snapshot.edgeNameFromTableIndex(edges[edgeIndex + edgeDataOffset]);
+ else
+ this.data = edges[edgeIndex + edgeDataOffset];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get from() { return this.snapshot.nodeWithIdentifier(this.fromId); }
</span><span class="lines">@@ -71,41 +75,44 @@
</span><span class="cx"> {
</span><span class="cx"> constructor(json)
</span><span class="cx"> {
</span><del>- let {nodes, nodeClassNames, edges, edgeTypes} = json;
</del><ins>+ let {nodes, nodeClassNames, edges, edgeTypes, edgeNames} = json;
</ins><span class="cx">
</span><span class="cx"> this._nodes = new Uint32Array(nodes.length * nodeFieldCount);
</span><span class="cx"> this._edges = new Uint32Array(edges.length * edgeFieldCount);
</span><span class="cx"> this._nodeIdentifierToIndex = new Map; // <id> => index in _nodes
</span><span class="cx">
</span><span class="cx"> this._edgeTypesTable = edgeTypes;
</span><ins>+ this._edgeNamesTable = edgeNames;
</ins><span class="cx"> this._nodeClassNamesTable = nodeClassNames;
</span><span class="cx">
</span><span class="cx"> let n = 0;
</span><del>- nodes.forEach((nodePayload) => {
- let [id, size, classNameTableIndex, internal] = nodePayload;
- this._nodeIdentifierToIndex.set(id, n);
- this._nodes[n++] = id;
- this._nodes[n++] = size;
- this._nodes[n++] = classNameTableIndex;
- this._nodes[n++] = internal;
</del><ins>+ for (let i = 0; i < nodes.length;) {
+ this._nodeIdentifierToIndex.set(nodes[i], n);
+ this._nodes[n++] = nodes[i++]; // id
+ this._nodes[n++] = nodes[i++]; // size
+ this._nodes[n++] = nodes[i++]; // classNameTableIndex
+ this._nodes[n++] = nodes[i++]; // internal
</ins><span class="cx"> this._nodes[n++] = nodeNoEdgeValue;
</span><del>- });
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> let e = 0;
</span><span class="cx"> let lastNodeIdentifier = -1;
</span><del>- edges.sort((a, b) => a[0] - b[0]).forEach((edgePayload) => {
- let [fromIdentifier, toIdentifier, edgeTypeTableIndex, data] = edgePayload;
</del><ins>+ for (let i = 0; i < edges.length;) {
+ let fromIdentifier = edges[i++]; // fromIdentifier
+ let toIdentifier = edges[i++]; // toIdentifier
+ assert(lastNodeIdentifier <= fromIdentifier, "Edge list should be ordered by from node identifier");
</ins><span class="cx"> if (fromIdentifier !== lastNodeIdentifier) {
</span><span class="cx"> let nodeIndex = this._nodeIdentifierToIndex.get(fromIdentifier);
</span><span class="cx"> assert(this._nodes[nodeIndex + nodeIdOffset] === fromIdentifier, "Node lookup failed");
</span><span class="cx"> this._nodes[nodeIndex + nodeFirstEdgeOffset] = e;
</span><span class="cx"> lastNodeIdentifier = fromIdentifier;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> this._edges[e++] = fromIdentifier;
</span><span class="cx"> this._edges[e++] = toIdentifier;
</span><del>- this._edges[e++] = edgeTypeTableIndex;
- this._edges[e++] = data;
- });
</del><ins>+ this._edges[e++] = edges[i++]; // edgeTypeTableIndex
+ this._edges[e++] = edges[i++]; // data
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get nodes() { return this._nodes; }
</span><span class="lines">@@ -136,6 +143,11 @@
</span><span class="cx"> {
</span><span class="cx"> return this._edgeTypesTable[tableIndex];
</span><span class="cx"> }
</span><ins>+
+ edgeNameFromTableIndex(tableIndex)
+ {
+ return this._edgeNamesTable[tableIndex];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function createCheapHeapSnapshot() {
</span><span class="lines">@@ -189,27 +201,39 @@
</span><span class="cx"> {
</span><span class="cx"> constructor(json)
</span><span class="cx"> {
</span><del>- let {version, nodes, nodeClassNames, edges, edgeTypes} = json;
</del><ins>+ let {version, nodes, nodeClassNames, edges, edgeTypes, edgeNames} = json;
</ins><span class="cx">
</span><span class="cx"> this.nodeMap = new Map;
</span><span class="cx">
</span><del>- this.nodes = nodes.map((nodePayload) => {
- let [id, size, classNameIndex, internal] = nodePayload;
</del><ins>+ this.nodes = [];
+ for (let i = 0; i < nodes.length;) {
+ let id = nodes[i++];
+ let size = nodes[i++];
+ let classNameIndex = nodes[i++];
+ let internal = nodes[i++];
+
</ins><span class="cx"> let node = new HeapSnapshotNode(id, nodeClassNames[classNameIndex], size, internal);
</span><span class="cx"> this.nodeMap.set(id, node);
</span><del>- return node;
- });
</del><ins>+ this.nodes.push(node);
+ }
</ins><span class="cx">
</span><del>- edges.map((edgePayload) => {
- let [fromIdentifier, toIdentifier, edgeTypeIndex, data] = edgePayload;
</del><ins>+ for (let i = 0; i < edges.length;) {
+ let fromIdentifier = edges[i++];
+ let toIdentifier = edges[i++];
+ let edgeTypeIndex = edges[i++];
+ let data = edges[i++];
+
</ins><span class="cx"> let from = this.nodeMap.get(fromIdentifier);
</span><span class="cx"> let to = this.nodeMap.get(toIdentifier);
</span><span class="cx"> assert(from, "Missing node for `from` part of edge");
</span><span class="cx"> assert(to, "Missing node for `to` part of edge");
</span><ins>+ let type = edgeTypes[edgeTypeIndex];
+ if (type === "Property" || type === "Variable")
+ data = edgeNames[data];
</ins><span class="cx"> let edge = new HeapSnapshotEdge(from, to, edgeTypes[edgeTypeIndex], data);
</span><span class="cx"> from.outgoingEdges.push(edge);
</span><span class="cx"> to.incomingEdges.push(edge);
</span><del>- });
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> this.rootNode = this.nodeMap.get(0);
</span><span class="cx"> assert(this.rootNode, "Missing <root> node with identifier 0");
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198158 => 198159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-14 21:44:27 UTC (rev 198158)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-14 21:50:20 UTC (rev 198159)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Reduce generated JSON HeapSnapshot size
+ https://bugs.webkit.org/show_bug.cgi?id=155460
+
+ Reviewed by Geoffrey Garen.
+
+ * UserInterface/Models/HeapSnapshot.js:
+ (WebInspector.HeapSnapshot.fromPayload):
+ Update for the slightly modified format.
+
</ins><span class="cx"> 2016-03-14 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r198095.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsHeapSnapshotjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/HeapSnapshot.js (198158 => 198159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/HeapSnapshot.js 2016-03-14 21:44:27 UTC (rev 198158)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/HeapSnapshot.js 2016-03-14 21:50:20 UTC (rev 198159)
</span><span class="lines">@@ -77,36 +77,39 @@
</span><span class="cx">
</span><span class="cx"> static fromPayload(payload)
</span><span class="cx"> {
</span><del>- let {version, nodes, nodeClassNames, edges, edgeTypes} = payload;
</del><ins>+ let {version, nodes, nodeClassNames, edges, edgeTypes, edgeNames} = payload;
</ins><span class="cx"> console.assert(version === 1, "Only know how to handle JavaScriptCore Heap Snapshot Format Version 1");
</span><span class="cx"> console.assert(edgeTypes.every((type) => type in WebInspector.HeapSnapshotEdge.EdgeType), "Unexpected edge type", edgeTypes);
</span><span class="cx">
</span><span class="cx"> let nodeMap = new Map;
</span><span class="cx">
</span><span class="cx"> // Turn nodes into real nodes.
</span><del>- for (let i = 0, length = nodes.length; i < length; ++i) {
- let nodePayload = nodes[i];
- let id = nodePayload[0];
- let size = nodePayload[1];
- let classNameIndex = nodePayload[2];
- let internal = nodePayload[3];
</del><ins>+ let processedNodes = [];
+ for (let i = 0, length = nodes.length; i < length;) {
+ let id = nodes[i++];
+ let size = nodes[i++];
+ let classNameIndex = nodes[i++];
+ let internal = nodes[i++];
</ins><span class="cx">
</span><span class="cx"> let node = new WebInspector.HeapSnapshotNode(id, nodeClassNames[classNameIndex], size, !!internal);
</span><span class="cx"> nodeMap.set(id, node);
</span><del>- nodes[i] = node;
</del><ins>+ processedNodes.push(node);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Turn edges into real edges and set them on the nodes.
</span><del>- for (let i = 0, length = edges.length; i < length; ++i) {
- let edgePayload = edges[i];
- let fromIdentifier = edgePayload[0];
- let toIdentifier = edgePayload[1];
- let edgeTypeIndex = edgePayload[2];
- let data = edgePayload[3];
</del><ins>+ for (let i = 0, length = edges.length; i < length;) {
+ let fromIdentifier = edges[i++];
+ let toIdentifier = edges[i++];
+ let edgeTypeIndex = edges[i++];
+ let data = edges[i++];
</ins><span class="cx">
</span><span class="cx"> let from = nodeMap.get(fromIdentifier);
</span><span class="cx"> let to = nodeMap.get(toIdentifier);
</span><del>- let edge = new WebInspector.HeapSnapshotEdge(from, to, edgeTypes[edgeTypeIndex], data);
</del><ins>+ let type = edgeTypes[edgeTypeIndex];
+ if (type === WebInspector.HeapSnapshotEdge.EdgeType.Property || type === WebInspector.HeapSnapshotEdge.EdgeType.Variable)
+ data = edgeNames[data];
+
+ let edge = new WebInspector.HeapSnapshotEdge(from, to, type, data);
</ins><span class="cx"> from.outgoingEdges.push(edge);
</span><span class="cx"> to.incomingEdges.push(edge);
</span><span class="cx"> }
</span><span class="lines">@@ -122,7 +125,7 @@
</span><span class="cx"> for (let i = 0, length = rootNodeEdges.length; i < length; ++i)
</span><span class="cx"> rootNodeEdges[i].to.gcRoot = true;
</span><span class="cx">
</span><del>- return new WebInspector.HeapSnapshot(rootNode, nodes, nodeMap);
</del><ins>+ return new WebInspector.HeapSnapshot(rootNode, processedNodes, nodeMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span></span></pre>
</div>
</div>
</body>
</html>