Skip to content

Commit c0fed8a

Browse files
caseqCommit bot
caseq
authored and
Commit bot
committed
Revert of DevTools: extract CPU profile independent part of CPUProfileNode. (patchset #3 id:40001 of https://codereview.chromium.org/1873973002/ )
Reason for revert: This broke at least two timeline tests with Cannot read property 'parent' of null BUG=603767 Original issue's description: > DevTools: extract CPU profile independent part of CPUProfileNode. > > This is a prerequisite to make the profile node class reused for sampling heap profiler. > > BUG=586613 > > Committed: https://crrev.com/1c33b9ee4940826b3a972c093cbc3f8e1f1b3f50 > Cr-Commit-Position: refs/heads/master@{#387249} [email protected] # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=586613 Review URL: https://codereview.chromium.org/1889963003 Cr-Commit-Position: refs/heads/master@{#387716}
1 parent decf4d4 commit c0fed8a

File tree

4 files changed

+79
-217
lines changed

4 files changed

+79
-217
lines changed

‎devtools.gypi

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@
156156
'front_end/sdk/NetworkManager.js',
157157
'front_end/sdk/NetworkRequest.js',
158158
'front_end/sdk/PaintProfiler.js',
159-
'front_end/sdk/ProfileTreeModel.js',
160159
'front_end/sdk/RemoteObject.js',
161160
'front_end/sdk/Resource.js',
162161
'front_end/sdk/ResourceTreeModel.js',

‎front_end/sdk/CPUProfileDataModel.js

+79-92
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,72 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
/**
6-
* @constructor
7-
* @extends {WebInspector.ProfileNode}
8-
* @param {!ProfilerAgent.CPUProfileNode} sourceNode
9-
* @param {number} sampleTime
10-
*/
11-
WebInspector.CPUProfileNode = function(sourceNode, sampleTime)
12-
{
13-
WebInspector.ProfileNode.call(this, sourceNode.functionName, sourceNode.scriptId, sourceNode.url, sourceNode.lineNumber, sourceNode.columnNumber);
14-
this.id = sourceNode.id;
15-
this.self = sourceNode.hitCount * sampleTime;
16-
this.callUID = sourceNode.callUID;
17-
this.positionTicks = sourceNode.positionTicks;
18-
this.deoptReason = sourceNode.deoptReason;
19-
// TODO: Remove the following field in favor of this.self
20-
this.selfTime = this.self;
21-
}
22-
23-
WebInspector.CPUProfileNode.prototype = {
24-
__proto__: WebInspector.ProfileNode.prototype
25-
}
265

276
/**
287
* @constructor
29-
* @extends {WebInspector.ProfileTreeModel}
308
* @param {!ProfilerAgent.CPUProfile} profile
319
*/
3210
WebInspector.CPUProfileDataModel = function(profile)
3311
{
12+
this.profileHead = profile.head;
3413
this.samples = profile.samples;
3514
this.timestamps = profile.timestamps;
36-
// Convert times from sec to msec.
3715
this.profileStartTime = profile.startTime * 1000;
3816
this.profileEndTime = profile.endTime * 1000;
39-
this.totalHitCount = 0;
40-
if (!WebInspector.moduleSetting("showNativeFunctionsInJSProfile").get())
41-
this._filterNativeFrames(profile.head);
42-
this.profileHead = this._translateProfileTree(profile.head);
43-
WebInspector.ProfileTreeModel.call(this, this.profileHead, this.profileStartTime, this.profileEndTime);
44-
this._extractMetaNodes();
17+
this._assignParentsInProfile();
4518
if (this.samples) {
46-
this._buildIdToNodeMap();
4719
this._sortSamples();
4820
this._normalizeTimestamps();
21+
this._buildIdToNodeMap();
4922
this._fixMissingSamples();
5023
}
51-
this._assignTotalTimes(this.profileHead);
24+
if (!WebInspector.moduleSetting("showNativeFunctionsInJSProfile").get())
25+
this._filterNativeFrames();
26+
this._assignDepthsInProfile();
27+
this._calculateTimes(profile);
5228
}
5329

5430
WebInspector.CPUProfileDataModel.prototype = {
5531
/**
56-
* @param {!ProfilerAgent.CPUProfileNode} root
32+
* @param {!ProfilerAgent.CPUProfile} profile
5733
*/
58-
_filterNativeFrames: function(root)
34+
_calculateTimes: function(profile)
35+
{
36+
function totalHitCount(node) {
37+
var result = node.hitCount;
38+
for (var i = 0; i < node.children.length; i++)
39+
result += totalHitCount(node.children[i]);
40+
return result;
41+
}
42+
profile.totalHitCount = totalHitCount(profile.head);
43+
this.totalHitCount = profile.totalHitCount;
44+
45+
var duration = this.profileEndTime - this.profileStartTime;
46+
var samplingInterval = duration / profile.totalHitCount;
47+
this.samplingInterval = samplingInterval;
48+
49+
function calculateTimesForNode(node) {
50+
node.selfTime = node.hitCount * samplingInterval;
51+
var totalHitCount = node.hitCount;
52+
for (var i = 0; i < node.children.length; i++)
53+
totalHitCount += calculateTimesForNode(node.children[i]);
54+
node.totalTime = totalHitCount * samplingInterval;
55+
return totalHitCount;
56+
}
57+
calculateTimesForNode(profile.head);
58+
},
59+
60+
_filterNativeFrames: function()
5961
{
60-
// TODO: get rid of this function and do the filtering while _translateProfileTree
6162
if (this.samples) {
62-
/** @type {!Map<number, !ProfilerAgent.CPUProfileNode>} */
63-
var idToNode = new Map();
64-
var stack = [root];
65-
while (stack.length) {
66-
var node = stack.pop();
67-
idToNode.set(node.id, node);
68-
for (var i = 0; i < node.children.length; i++) {
69-
node.children[i].parent = node;
70-
stack.push(node.children[i]);
71-
}
72-
}
7363
for (var i = 0; i < this.samples.length; ++i) {
74-
var node = idToNode.get(this.samples[i]);
64+
var node = this.nodeByIndex(i);
7565
while (isNativeNode(node))
7666
node = node.parent;
7767
this.samples[i] = node.id;
7868
}
7969
}
80-
processSubtree(root);
70+
processSubtree(this.profileHead);
8171

8272
/**
8373
* @param {!ProfilerAgent.CPUProfileNode} node
@@ -128,43 +118,44 @@ WebInspector.CPUProfileDataModel.prototype = {
128118
}
129119
},
130120

131-
/**
132-
* @param {!ProfilerAgent.CPUProfileNode} root
133-
* @return {!WebInspector.CPUProfileNode}
134-
*/
135-
_translateProfileTree: function(root)
121+
_assignParentsInProfile: function()
136122
{
137-
/**
138-
* @param {!ProfilerAgent.CPUProfileNode} node
139-
* @return {number}
140-
*/
141-
function computeHitCountForSubtree(node)
142-
{
143-
return node.children.reduce((acc, node) => acc + computeHitCountForSubtree(node), node.hitCount);
144-
}
145-
this.totalHitCount = computeHitCountForSubtree(root);
146-
var sampleTime = (this.profileEndTime - this.profileStartTime) / this.totalHitCount;
147-
var resultRoot = new WebInspector.CPUProfileNode(root, sampleTime);
148-
var targetNodeStack = [resultRoot];
149-
var sourceNodeStack = [root];
150-
while (sourceNodeStack.length) {
151-
var sourceNode = sourceNodeStack.pop();
152-
var parentNode = targetNodeStack.pop();
153-
parentNode.children = sourceNode.children.map(child => new WebInspector.CPUProfileNode(child, sampleTime));
154-
sourceNodeStack.push.apply(sourceNodeStack, sourceNode.children);
155-
targetNodeStack.push.apply(targetNodeStack, parentNode.children);
123+
var head = this.profileHead;
124+
head.parent = null;
125+
var nodesToTraverse = [ head ];
126+
while (nodesToTraverse.length) {
127+
var parent = nodesToTraverse.pop();
128+
var children = parent.children;
129+
var length = children.length;
130+
for (var i = 0; i < length; ++i) {
131+
var child = children[i];
132+
child.parent = parent;
133+
if (child.children.length)
134+
nodesToTraverse.push(child);
135+
}
156136
}
157-
return resultRoot;
158137
},
159138

160-
/**
161-
* @param {!WebInspector.ProfileNode} node
162-
*/
163-
_assignTotalTimes: function(node)
139+
_assignDepthsInProfile: function()
164140
{
165-
// TODO: get rid of this field in favor of this.total
166-
node.totalTime = node.total;
167-
node.children.forEach(this._assignTotalTimes, this);
141+
var head = this.profileHead;
142+
head.depth = -1;
143+
this.maxDepth = 0;
144+
var nodesToTraverse = [ head ];
145+
while (nodesToTraverse.length) {
146+
var parent = nodesToTraverse.pop();
147+
var depth = parent.depth + 1;
148+
if (depth > this.maxDepth)
149+
this.maxDepth = depth;
150+
var children = parent.children;
151+
var length = children.length;
152+
for (var i = 0; i < length; ++i) {
153+
var child = children[i];
154+
child.depth = depth;
155+
if (child.children.length)
156+
nodesToTraverse.push(child);
157+
}
158+
}
168159
},
169160

170161
_sortSamples: function()
@@ -222,7 +213,7 @@ WebInspector.CPUProfileDataModel.prototype = {
222213

223214
_buildIdToNodeMap: function()
224215
{
225-
/** @type {!Object<number, !WebInspector.CPUProfileNode>} */
216+
/** @type {!Object.<number, !ProfilerAgent.CPUProfileNode>} */
226217
this._idToNode = {};
227218
var idToNode = this._idToNode;
228219
var stack = [this.profileHead];
@@ -232,10 +223,7 @@ WebInspector.CPUProfileDataModel.prototype = {
232223
for (var i = 0; i < node.children.length; i++)
233224
stack.push(node.children[i]);
234225
}
235-
},
236226

237-
_extractMetaNodes: function()
238-
{
239227
var topLevelNodes = this.profileHead.children;
240228
for (var i = 0; i < topLevelNodes.length && !(this.gcNode && this.programNode && this.idleNode); i++) {
241229
var node = topLevelNodes[i];
@@ -277,8 +265,8 @@ WebInspector.CPUProfileDataModel.prototype = {
277265
}
278266

279267
/**
280-
* @param {!WebInspector.ProfileNode} node
281-
* @return {!WebInspector.ProfileNode}
268+
* @param {!ProfilerAgent.CPUProfileNode} node
269+
* @return {!ProfilerAgent.CPUProfileNode}
282270
*/
283271
function bottomNode(node)
284272
{
@@ -298,8 +286,8 @@ WebInspector.CPUProfileDataModel.prototype = {
298286
},
299287

300288
/**
301-
* @param {function(number, !WebInspector.CPUProfileNode, number)} openFrameCallback
302-
* @param {function(number, !WebInspector.CPUProfileNode, number, number, number)} closeFrameCallback
289+
* @param {function(number, !ProfilerAgent.CPUProfileNode, number)} openFrameCallback
290+
* @param {function(number, !ProfilerAgent.CPUProfileNode, number, number, number)} closeFrameCallback
303291
* @param {number=} startTime
304292
* @param {number=} stopTime
305293
*/
@@ -370,7 +358,7 @@ WebInspector.CPUProfileDataModel.prototype = {
370358
var start = stackStartTimes[stackTop];
371359
var duration = sampleTime - start;
372360
stackChildrenDuration[stackTop - 1] += duration;
373-
closeFrameCallback(prevNode.depth, /** @type {!WebInspector.CPUProfileNode} */(prevNode), start, duration, duration - stackChildrenDuration[stackTop]);
361+
closeFrameCallback(prevNode.depth, prevNode, start, duration, duration - stackChildrenDuration[stackTop]);
374362
--stackTop;
375363
if (node.depth === prevNode.depth) {
376364
stackNodes.push(node);
@@ -402,19 +390,18 @@ WebInspector.CPUProfileDataModel.prototype = {
402390
var start = stackStartTimes[stackTop];
403391
var duration = sampleTime - start;
404392
stackChildrenDuration[stackTop - 1] += duration;
405-
closeFrameCallback(node.depth, /** @type {!WebInspector.CPUProfileNode} */(node), start, duration, duration - stackChildrenDuration[stackTop]);
393+
closeFrameCallback(node.depth, node, start, duration, duration - stackChildrenDuration[stackTop]);
406394
--stackTop;
407395
}
408396
},
409397

410398
/**
411399
* @param {number} index
412-
* @return {!WebInspector.CPUProfileNode}
400+
* @return {!ProfilerAgent.CPUProfileNode}
413401
*/
414402
nodeByIndex: function(index)
415403
{
416404
return this._idToNode[this.samples[index]];
417-
},
405+
}
418406

419-
__proto__: WebInspector.ProfileTreeModel.prototype
420407
}

0 commit comments

Comments
 (0)