Changeset 117786 in webkit

Timestamp:

May 21, 2012, 9:02:07 AM (14 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: switch buildDominatedNodes function to front-end calculated _dominatorsTree
​https://bugs.webkit.org/show_bug.cgi?id=87022

The new version is using _dominatorsTree array that was build at front-end.

Reviewed by Yury Semikhatsky.

Source/WebCore:

• inspector/front-end/HeapSnapshot.js:

(WebInspector.HeapSnapshot.prototype._init):
(WebInspector.HeapSnapshot.prototype._buildDominatedNodes):

LayoutTests:

• inspector/profiler/heap-snapshot-expected.txt:
• inspector/profiler/heap-snapshot.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/profiler/heap-snapshot-expected.txt (modified) (1 diff)
• LayoutTests/inspector/profiler/heap-snapshot.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/HeapSnapshot.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-21  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: switch buildDominatedNodes function to front-end calculated _dominatorsTree
+        https://bugs.webkit.org/show_bug.cgi?id=87022
+
+        The new version is using _dominatorsTree array that was build at front-end.
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/profiler/heap-snapshot-expected.txt:
+        * inspector/profiler/heap-snapshot.html:
+
 2012-05-21  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/LayoutTests/inspector/profiler/heap-snapshot-expected.txt

@@ -18 +18 @@
 Running: heapSnapshotDominatorsTreeTest
 
+Running: heapSnapshotDominatedNodesTest
+
 Running: heapSnapshotPageOwnedTest
 

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

@@ -114 +114 @@
             for (var i = 0; i < expected.length; ++i)
                 InspectorTest.assertEquals(expected[i], dominatorsTree[i], "Dominators Tree");
+            next();
+        },
+
+        function heapSnapshotDominatedNodesTest(next)
+        {
+            var snapshot = new WebInspector.HeapSnapshot(InspectorTest.createHeapSnapshotMock());
+
+            var expectedDominatedNodes = [21, 14, 7, 28, 35];
+            var actualDominatedNodes = snapshot._dominatedNodes;
+            InspectorTest.assertEquals(expectedDominatedNodes.length, actualDominatedNodes.length, "Dominated Nodes length");
+            for (var i = 0; i < expectedDominatedNodes.length; ++i)
+                InspectorTest.assertEquals(expectedDominatedNodes[i], actualDominatedNodes[i], "Dominated Nodes");
+
+            var expectedDominatedNodeIndex = [0, 3, 3, 4, 5, 5, 5];
+            var actualDominatedNodeIndex = snapshot._firstDominatedNodeIndex;
+            InspectorTest.assertEquals(expectedDominatedNodeIndex.length, actualDominatedNodeIndex.length, "Dominated Nodes Index length");
+            for (var i = 0; i < expectedDominatedNodeIndex.length; ++i)
+                InspectorTest.assertEquals(expectedDominatedNodeIndex[i], actualDominatedNodeIndex[i], "Dominated Nodes Index");
             next();
         },

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-21  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: switch buildDominatedNodes function to front-end calculated _dominatorsTree
+        https://bugs.webkit.org/show_bug.cgi?id=87022
+
+        The new version is using _dominatorsTree array that was build at front-end.
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/HeapSnapshot.js:
+        (WebInspector.HeapSnapshot.prototype._init):
+        (WebInspector.HeapSnapshot.prototype._buildDominatedNodes):
+
 2012-05-21  Pavel Feldman  <pfeldman@chromium.org>
 

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

@@ -720 +720 @@
         this._markInvisibleEdges();
         this._buildRetainers();
-        if (this._dominatorOffset !== -1) // For tests where we may not have dominator field.
-            this._buildDominatedNodes()
         this._calculateFlags();
         this._calculateObjectToWindowDistance();
         var result = this._buildPostOrderIndex();
         this._dominatorsTree = this._buildDominatorTree(result.postOrderIndex2NodeIndex, result.nodeOrdinal2PostOrderIndex);
+        this._buildDominatedNodes();
     },
 
@@ -1271 +1270 @@
         // Count the number of dominated nodes for each node. Skip the root (node at
         // index 0) as it is the only node that dominates itself.
-        for (var nodeIndex = this._nodeFieldCount; nodeIndex < this._nodes.length; nodeIndex += this._nodeFieldCount) {
-            var dominatorIndex = this._nodes[nodeIndex + this._dominatorOffset];
-            if (dominatorIndex % this._nodeFieldCount)
-                throw new Error("Wrong dominatorIndex " + dominatorIndex + " nodeIndex = " + nodeIndex + " nodeCount = " + this.nodeCount);
-            ++indexArray[dominatorIndex / this._nodeFieldCount];
-        }
+        var nodeFieldCount = this._nodeFieldCount;
+        var dominatorsTree = this._dominatorsTree;
+        for (var nodeOrdinal = 1, l = this.nodeCount; nodeOrdinal < l; ++nodeOrdinal)
+            ++indexArray[dominatorsTree[nodeOrdinal] / this._nodeFieldCount];
         // Put in the first slot of each dominatedNodes slice the count of entries
         // that will be filled.
         var firstDominatedNodeIndex = 0;
-        for (var i = 0; i < this.nodeCount; ++i) {
+        for (var i = 0, l = this.nodeCount; i < l; ++i) {
             var dominatedCount = dominatedNodes[firstDominatedNodeIndex] = indexArray[i];
             indexArray[i] = firstDominatedNodeIndex;
@@ -1288 +1285 @@
         // Fill up the dominatedNodes array with indexes of dominated nodes. Skip the root (node at
         // index 0) as it is the only node that dominates itself.
-        for (var nodeIndex = this._nodeFieldCount; nodeIndex < this._nodes.length; nodeIndex += this._nodeFieldCount) {
-            var dominatorIndex = this._nodes[nodeIndex + this._dominatorOffset];
-            if (dominatorIndex % this._nodeFieldCount)
-                throw new Error("Wrong dominatorIndex " + dominatorIndex);
-            var dominatorPos = dominatorIndex / this._nodeFieldCount;
-            var dominatedRefIndex = indexArray[dominatorPos];
+        for (var nodeOrdinal = 1, l = this.nodeCount; nodeOrdinal < l; ++nodeOrdinal) {
+            var dominatorOrdinal = dominatorsTree[nodeOrdinal] / nodeFieldCount;
+            var dominatedRefIndex = indexArray[dominatorOrdinal];
             dominatedRefIndex += (--dominatedNodes[dominatedRefIndex]);
-            dominatedNodes[dominatedRefIndex] = nodeIndex;
+            dominatedNodes[dominatedRefIndex] = nodeOrdinal * nodeFieldCount;
         }
     },