Title: [117437] trunk/Source/WebCore
- Revision
- 117437
- Author
- loi...@chromium.org
- Date
- 2012-05-17 05:48:07 -0700 (Thu, 17 May 2012)
Log Message
Web Inspector: HeapSnapshot: speed-up calculateObjectToWindowDistance
https://bugs.webkit.org/show_bug.cgi?id=86718
The idea is to switch from nodeIndex2distance array to nodeOrdinal2distance external array.
Due to nature of nodeIndex values the original array was sparsed.
Reviewed by Yury Semikhatsky.
* inspector/front-end/HeapSnapshot.js:
(WebInspector.HeapSnapshotNode.prototype.get distanceToWindow):
(WebInspector.HeapSnapshot.prototype._calculateObjectToWindowDistance):
(WebInspector.HeapSnapshot.prototype._bfs):
(WebInspector.HeapSnapshot.prototype._buildAggregates):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117436 => 117437)
--- trunk/Source/WebCore/ChangeLog 2012-05-17 12:39:19 UTC (rev 117436)
+++ trunk/Source/WebCore/ChangeLog 2012-05-17 12:48:07 UTC (rev 117437)
@@ -1,3 +1,19 @@
+2012-05-17 Ilya Tikhonovsky <loi...@chromium.org>
+
+ Web Inspector: HeapSnapshot: speed-up calculateObjectToWindowDistance
+ https://bugs.webkit.org/show_bug.cgi?id=86718
+
+ The idea is to switch from nodeIndex2distance array to nodeOrdinal2distance external array.
+ Due to nature of nodeIndex values the original array was sparsed.
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/HeapSnapshot.js:
+ (WebInspector.HeapSnapshotNode.prototype.get distanceToWindow):
+ (WebInspector.HeapSnapshot.prototype._calculateObjectToWindowDistance):
+ (WebInspector.HeapSnapshot.prototype._bfs):
+ (WebInspector.HeapSnapshot.prototype._buildAggregates):
+
2012-05-11 Kinuko Yasuda <kin...@chromium.org>
Allow FileSystem API implementation to pass snapshot metadata at File creation time
Modified: trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js (117436 => 117437)
--- trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js 2012-05-17 12:39:19 UTC (rev 117436)
+++ trunk/Source/WebCore/inspector/front-end/HeapSnapshot.js 2012-05-17 12:48:07 UTC (rev 117437)
@@ -426,7 +426,7 @@
get distanceToWindow()
{
- return this._snapshot._distancesToWindow[this.nodeIndex];
+ return this._snapshot._distancesToWindow[this.nodeIndex / this._snapshot._nodeFieldCount];
},
get className()
@@ -895,29 +895,29 @@
_calculateObjectToWindowDistance: function()
{
- this._distancesToWindow = new Array(this.nodeCount);
+ var nodeFieldCount = this._nodeFieldCount;
+ var distances = new Uint32Array(this.nodeCount);
// bfs for Window roots
var list = [];
for (var iter = this.rootNode.edges; iter.hasNext(); iter.next()) {
var node = iter.edge.node;
if (node.isWindow) {
- if (node.nodeIndex % this._nodeFieldCount)
- throw new Error("Invalid nodeIndex: " + node.nodeIndex);
list.push(node.nodeIndex);
- this._distancesToWindow[node.nodeIndex] = 0;
+ distances[node.nodeIndex / nodeFieldCount] = 0;
}
}
- this._bfs(list);
+ this._bfs(list, distances);
// bfs for root
list = [];
list.push(this._rootNodeIndex);
- this._distancesToWindow[this._rootNodeIndex] = 0;
- this._bfs(list);
+ distances[this._rootNodeIndex / nodeFieldCount] = 0;
+ this._bfs(list, distances);
+ this._distancesToWindow = distances;
},
- _bfs: function(list)
+ _bfs: function(list, distances)
{
// Peload fields into local variables for better performance.
var edgeFieldsCount = this._edgeFieldsCount;
@@ -925,29 +925,28 @@
var nodeFieldCount = this._nodeFieldCount;
var firstEdgeIndexOffset = this._firstEdgeIndexOffset;
var edgeToNodeOffset = this._edgeToNodeOffset;
- var distancesToWindow = this._distancesToWindow;
var nodes = this._nodes;
+ var nodeCount = this.nodeCount;
var index = 0;
while (index < list.length) {
var nodeIndex = list[index++]; // shift generates too much garbage.
+ var nodeOrdinal = nodeIndex / nodeFieldCount;
if (index > 100000) {
list = list.slice(index);
index = 0;
}
- var distance = distancesToWindow[nodeIndex] + 1;
-
+ var distance = distances[nodeOrdinal] + 1;
var firstEdgeIndex = nodes[nodeIndex + firstEdgeIndexOffset];
- var edgesEnd = nodeIndex < nodes.length
- ? nodes[nodeIndex + nodeFieldCount + firstEdgeIndexOffset]
+ var edgesEnd = nodeOrdinal < nodeCount - 1
+ ? nodes[nodeIndex + firstEdgeIndexOffset + nodeFieldCount]
: containmentEdges.length;
for (var edgeToNodeIndex = firstEdgeIndex + edgeToNodeOffset; edgeToNodeIndex < edgesEnd; edgeToNodeIndex += edgeFieldsCount) {
var childNodeIndex = containmentEdges[edgeToNodeIndex];
- if (childNodeIndex % nodeFieldCount)
- throw new Error("Invalid childNodeIndex: " + childNodeIndex);
- if (childNodeIndex in distancesToWindow)
+ var childNodeOrdinal = childNodeIndex / nodeFieldCount;
+ if (distances[childNodeOrdinal])
continue;
- distancesToWindow[childNodeIndex] = distance;
+ distances[childNodeOrdinal] = distance;
list.push(childNodeIndex);
}
}
@@ -967,6 +966,7 @@
var distancesToWindow = this._distancesToWindow;
for (var nodeIndex = this._rootNodeIndex; nodeIndex < nodesLength; nodeIndex += nodeFieldsCount) {
+ var nodeOrdinal = nodeIndex / nodeFieldsCount;
node.nodeIndex = nodeIndex;
var selfSize = nodes[nodeIndex + selfSizeOffset];
if (filter && !filter(node))
@@ -979,7 +979,7 @@
var nameMatters = nodeType === "object" || nodeType === "native";
var value = {
count: 1,
- distanceToWindow: distancesToWindow[nodeIndex],
+ distanceToWindow: distancesToWindow[nodeOrdinal],
self: selfSize,
maxRet: 0,
type: nodeType,
@@ -990,7 +990,7 @@
aggregatesByClassName[node.className] = value;
} else {
var clss = aggregates[classIndex];
- clss.distanceToWindow = Math.min(clss.distanceToWindow, distancesToWindow[nodeIndex]);
+ clss.distanceToWindow = Math.min(clss.distanceToWindow, distancesToWindow[nodeOrdinal]);
++clss.count;
clss.self += selfSize;
clss.idxs.push(nodeIndex);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
