Changeset 106665 in webkit

Timestamp:

Feb 3, 2012 8:50:16 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Retained size for classes is too conservative in heap profiler
​https://bugs.webkit.org/show_bug.cgi?id=77726

Patch by Alexei Filippov <​alexeif@chromium.org> on 2012-02-03
Reviewed by Yury Semikhatsky.

Makes retained size of all objects of particular class show correct value
in Summary view of heap profiler.

• inspector/front-end/DetailedHeapshotGridNodes.js:

(WebInspector.HeapSnapshotConstructorNode.prototype.get data):

• inspector/front-end/HeapSnapshot.js:

(WebInspector.HeapSnapshot.prototype._buildAggregates):
(WebInspector.HeapSnapshot.prototype._buildAggregates.forDominatedNodes):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/DetailedHeapshotGridNodes.js (modified) (1 diff)
• inspector/front-end/HeapSnapshot.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-03  Alexei Filippov  <alexeif@chromium.org>
+
+        Web Inspector: Retained size for classes is too conservative in heap profiler
+        https://bugs.webkit.org/show_bug.cgi?id=77726
+
+        Reviewed by Yury Semikhatsky.
+
+        Makes retained size of all objects of particular class show correct value
+        in Summary view of heap profiler.
+
+        * inspector/front-end/DetailedHeapshotGridNodes.js:
+        (WebInspector.HeapSnapshotConstructorNode.prototype.get data):
+        * inspector/front-end/HeapSnapshot.js:
+        (WebInspector.HeapSnapshot.prototype._buildAggregates):
+        (WebInspector.HeapSnapshot.prototype._buildAggregates.forDominatedNodes):
+
 2012-02-02  Alexander Pavlov  <apavlov@chromium.org>
 

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

@@ -608 +608 @@
         data["count"] =  Number.withThousandsSeparator(this._count);
         data["shallowSize"] = Number.withThousandsSeparator(this._shallowSize);
-        data["retainedSize"] = Number.withThousandsSeparator(this._retainedSize) + "+";
+        data["retainedSize"] = Number.withThousandsSeparator(this._retainedSize);
         if (view._showPercentage) {
             data["shallowSize-percent"] = this._toPercentString(this._shallowSizePercent);

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

@@ -916 +916 @@
     _buildAggregates: function(filter)
     {
+        function shouldSkip(node)
+        {
+            if (filter && !filter(node))
+                return true;
+            if (node.type !== "native" && node.selfSize === 0)
+                return true;
+            var className = node.className;
+            if (className === "Document DOM tree")
+                return true;
+            if (className === "Detached DOM tree")
+                return true;
+            return false;
+        }
+
         var aggregates = {};
         for (var iter = this._allNodes; iter.hasNext(); iter.next()) {
             var node = iter.node;
-            if (filter && !filter(node))
-                continue;
-            if (node.type !== "native" && node.selfSize === 0)
+            if (shouldSkip(node))
                 continue;
             var className = node.className;
-            if (className === "Document DOM tree")
-                continue;
-            if (className === "Detached DOM tree")
-                continue;
             var nameMatters = node.type === "object" || node.type === "native";
             if (!aggregates.hasOwnProperty(className))
@@ -934 +942 @@
             ++clss.count;
             clss.self += node.selfSize;
-            if (node.retainedSize > clss.maxRet)
-                clss.maxRet = node.retainedSize;
             clss.idxs.push(node.nodeIndex);
         }
+
+        // Recursively visit dominators tree and sum up retained sizes
+        // of topmost objects in each class.
+        // This gives us retained sizes for classes.
+        var seenClasses = {};
+        var snapshot = this;
+        function forDominatedNodes(nodeIndex)
+        {
+            var node = new WebInspector.HeapSnapshotNode(snapshot, nodeIndex);
+            var className = node.className;
+            var seen = !!seenClasses[className];
+            if (!seen && className in aggregates && !shouldSkip(node)) {
+                aggregates[className].maxRet += node.retainedSize;
+                seenClasses[className] = true;
+            }
+            var dominatedNodes = snapshot._dominatedNodesOfNode(node);
+            for (var i = 0; i < dominatedNodes.length; i++)
+                forDominatedNodes(dominatedNodes.item(i));
+            seenClasses[className] = seen;
+        }
+        forDominatedNodes(this._rootNodeIndex);
+
         // Shave off provisionally allocated space.
         for (var className in aggregates)