@paulirish/trace_engine 0.0.68 → 0.0.69
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.tmp/tsbuildinfo/tsconfig.tsbuildinfo +1 -1
- package/README.md +17 -1
- package/generated/protocol.d.ts +55 -13
- package/generated/protocol.js +1 -4
- package/locales/af.json +3 -6
- package/locales/am.json +3 -6
- package/locales/ar.json +3 -6
- package/locales/as.json +3 -6
- package/locales/az.json +3 -6
- package/locales/be.json +3 -6
- package/locales/bg.json +3 -6
- package/locales/bn.json +3 -6
- package/locales/bs.json +3 -6
- package/locales/ca.json +75 -78
- package/locales/cs.json +3 -6
- package/locales/cy.json +3 -6
- package/locales/da.json +3 -6
- package/locales/de.json +3 -6
- package/locales/el.json +3 -6
- package/locales/en-GB.json +3 -6
- package/locales/es-419.json +3 -6
- package/locales/es.json +3 -6
- package/locales/et.json +3 -6
- package/locales/eu.json +3 -6
- package/locales/fa.json +3 -6
- package/locales/fi.json +3 -6
- package/locales/fil.json +3 -6
- package/locales/fr-CA.json +37 -40
- package/locales/fr.json +3 -6
- package/locales/gl.json +18 -21
- package/locales/gu.json +3 -6
- package/locales/he.json +3 -6
- package/locales/hi.json +11 -14
- package/locales/hr.json +3 -6
- package/locales/hu.json +3 -6
- package/locales/hy.json +3 -6
- package/locales/id.json +3 -6
- package/locales/is.json +3 -6
- package/locales/it.json +3 -6
- package/locales/ja.json +3 -6
- package/locales/ka.json +3 -6
- package/locales/kk.json +3 -6
- package/locales/km.json +3 -6
- package/locales/kn.json +3 -6
- package/locales/ko.json +3 -6
- package/locales/ky.json +3 -6
- package/locales/lo.json +3 -6
- package/locales/lt.json +3 -6
- package/locales/lv.json +5 -8
- package/locales/mk.json +75 -78
- package/locales/ml.json +3 -6
- package/locales/mn.json +3 -6
- package/locales/mr.json +3 -6
- package/locales/ms.json +3 -6
- package/locales/my.json +3 -6
- package/locales/ne.json +29 -32
- package/locales/nl.json +3 -6
- package/locales/no.json +3 -6
- package/locales/or.json +3 -6
- package/locales/pa.json +3 -6
- package/locales/pl.json +3 -6
- package/locales/pt-PT.json +3 -6
- package/locales/pt.json +32 -35
- package/locales/ro.json +3 -6
- package/locales/ru.json +3 -6
- package/locales/si.json +3 -6
- package/locales/sk.json +3 -6
- package/locales/sl.json +3 -6
- package/locales/sq.json +3 -6
- package/locales/sr-Latn.json +3 -6
- package/locales/sr.json +3 -6
- package/locales/sv.json +3 -6
- package/locales/sw.json +4 -7
- package/locales/ta.json +3 -6
- package/locales/te.json +3 -6
- package/locales/th.json +3 -6
- package/locales/tr.json +3 -6
- package/locales/uk.json +3 -6
- package/locales/ur.json +3 -6
- package/locales/uz.json +3 -6
- package/locales/vi.json +3 -6
- package/locales/zh-HK.json +3 -6
- package/locales/zh-TW.json +3 -6
- package/locales/zh.json +3 -6
- package/locales/zu.json +3 -6
- package/models/trace/EventsSerializer.js +0 -7
- package/models/trace/EventsSerializer.js.map +1 -1
- package/models/trace/Processor.js +15 -7
- package/models/trace/Processor.js.map +1 -1
- package/models/trace/extras/ThirdParties.js +4 -6
- package/models/trace/extras/ThirdParties.js.map +1 -1
- package/models/trace/extras/TraceFilter.d.ts +1 -0
- package/models/trace/extras/TraceFilter.js +18 -8
- package/models/trace/extras/TraceFilter.js.map +1 -1
- package/models/trace/extras/TraceTree.d.ts +13 -16
- package/models/trace/extras/TraceTree.js +126 -101
- package/models/trace/extras/TraceTree.js.map +1 -1
- package/models/trace/handlers/ExtensionTraceDataHandler.d.ts +0 -5
- package/models/trace/handlers/ExtensionTraceDataHandler.js +0 -5
- package/models/trace/handlers/ExtensionTraceDataHandler.js.map +1 -1
- package/models/trace/handlers/FlowsHandler.js +9 -0
- package/models/trace/handlers/FlowsHandler.js.map +1 -1
- package/models/trace/handlers/MetaHandler.js +3 -0
- package/models/trace/handlers/MetaHandler.js.map +1 -1
- package/models/trace/handlers/RendererHandler.js +7 -6
- package/models/trace/handlers/RendererHandler.js.map +1 -1
- package/models/trace/handlers/SamplesHandler.d.ts +0 -1
- package/models/trace/handlers/SamplesHandler.js +4 -2
- package/models/trace/handlers/SamplesHandler.js.map +1 -1
- package/models/trace/handlers/ScriptsHandler.js +24 -22
- package/models/trace/handlers/ScriptsHandler.js.map +1 -1
- package/models/trace/handlers/types.d.ts +15 -0
- package/models/trace/handlers/types.js.map +1 -1
- package/models/trace/helpers/Extensions.js +1 -3
- package/models/trace/helpers/Extensions.js.map +1 -1
- package/models/trace/helpers/SamplesIntegrator.d.ts +17 -14
- package/models/trace/helpers/SamplesIntegrator.js +147 -84
- package/models/trace/helpers/SamplesIntegrator.js.map +1 -1
- package/models/trace/helpers/Trace.js +19 -14
- package/models/trace/helpers/Trace.js.map +1 -1
- package/models/trace/helpers/TreeHelpers.d.ts +13 -1
- package/models/trace/helpers/TreeHelpers.js +35 -8
- package/models/trace/helpers/TreeHelpers.js.map +1 -1
- package/models/trace/insights/DuplicatedJavaScript.js +1 -2
- package/models/trace/insights/DuplicatedJavaScript.js.map +1 -1
- package/models/trace/insights/SlowCSSSelector.js +2 -2
- package/models/trace/insights/SlowCSSSelector.js.map +1 -1
- package/models/trace/lantern/metrics/LargestContentfulPaint.d.ts +1 -0
- package/models/trace/lantern/metrics/LargestContentfulPaint.js +17 -4
- package/models/trace/lantern/metrics/LargestContentfulPaint.js.map +1 -1
- package/models/trace/lantern/simulation/Simulator.d.ts +4 -0
- package/models/trace/lantern/simulation/Simulator.js +4 -1
- package/models/trace/lantern/simulation/Simulator.js.map +1 -1
- package/models/trace/types/TraceEvents.d.ts +21 -19
- package/models/trace/types/TraceEvents.js.map +1 -1
- package/package.json +1 -1
- package/test/test-trace-engine.mjs +20 -17
|
@@ -4,10 +4,38 @@
|
|
|
4
4
|
import * as Helpers from '../helpers/helpers.js';
|
|
5
5
|
import * as Types from '../types/types.js';
|
|
6
6
|
const SamplesIntegrator = Helpers.SamplesIntegrator.SamplesIntegrator;
|
|
7
|
+
function buildEventFilter(filters) {
|
|
8
|
+
if (filters.length === 0) {
|
|
9
|
+
return () => true;
|
|
10
|
+
}
|
|
11
|
+
return e => {
|
|
12
|
+
for (let i = 0; i < filters.length; i++) {
|
|
13
|
+
if (!filters[i].accept(e)) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
return true;
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
function createEventIdCache() {
|
|
21
|
+
// Profile calls for the same frame share one callFrame object, and their ID
|
|
22
|
+
// only depends on its fields. Caching per root avoids rebuilding and
|
|
23
|
+
// re-hashing identical strings across root construction and child expansions.
|
|
24
|
+
const profileCallIdByCallFrame = new Map();
|
|
25
|
+
return (event) => {
|
|
26
|
+
if (Types.Events.isProfileCall(event)) {
|
|
27
|
+
let id = profileCallIdByCallFrame.get(event.callFrame);
|
|
28
|
+
if (id === undefined) {
|
|
29
|
+
id = generateEventID(event);
|
|
30
|
+
profileCallIdByCallFrame.set(event.callFrame, id);
|
|
31
|
+
}
|
|
32
|
+
return id;
|
|
33
|
+
}
|
|
34
|
+
return generateEventID(event);
|
|
35
|
+
};
|
|
36
|
+
}
|
|
7
37
|
export class Node {
|
|
8
|
-
/** ms */
|
|
9
38
|
totalTime;
|
|
10
|
-
/** ms */
|
|
11
39
|
selfTime;
|
|
12
40
|
transferSize;
|
|
13
41
|
id;
|
|
@@ -23,8 +51,8 @@ export class Node {
|
|
|
23
51
|
isGroupNodeInternal;
|
|
24
52
|
depth;
|
|
25
53
|
constructor(id, event) {
|
|
26
|
-
this.totalTime = 0;
|
|
27
|
-
this.selfTime = 0;
|
|
54
|
+
this.totalTime = Types.Timing.Micro(0);
|
|
55
|
+
this.selfTime = Types.Timing.Micro(0);
|
|
28
56
|
this.transferSize = 0;
|
|
29
57
|
this.id = id;
|
|
30
58
|
this.event = event;
|
|
@@ -98,7 +126,7 @@ export class TopDownNode extends Node {
|
|
|
98
126
|
const startTime = root.startTime;
|
|
99
127
|
const endTime = root.endTime;
|
|
100
128
|
const instantEventCallback = (root.doNotAggregate || root.includeInstantEvents) ? onInstantEvent : undefined;
|
|
101
|
-
const eventIdCallback = root.doNotAggregate ? undefined :
|
|
129
|
+
const eventIdCallback = root.doNotAggregate ? undefined : root.eventId;
|
|
102
130
|
const eventGroupIdCallback = root.getEventGroupIdCallback();
|
|
103
131
|
let depth = 0;
|
|
104
132
|
// The amount of ancestors found to match this node's ancestors
|
|
@@ -110,13 +138,12 @@ export class TopDownNode extends Node {
|
|
|
110
138
|
onStartEvent,
|
|
111
139
|
onEndEvent,
|
|
112
140
|
onInstantEvent: instantEventCallback,
|
|
113
|
-
startTime
|
|
114
|
-
endTime
|
|
141
|
+
startTime,
|
|
142
|
+
endTime,
|
|
115
143
|
eventFilter: root.filter,
|
|
116
144
|
ignoreAsyncEvents: false,
|
|
117
145
|
});
|
|
118
146
|
function onStartEvent(e) {
|
|
119
|
-
const { startTime: currentStartTime, endTime: currentEndTime } = Helpers.Timing.eventTimingsMilliSeconds(e);
|
|
120
147
|
++depth;
|
|
121
148
|
if (depth > path.length + 2) {
|
|
122
149
|
return;
|
|
@@ -124,8 +151,10 @@ export class TopDownNode extends Node {
|
|
|
124
151
|
if (!matchPath(e)) {
|
|
125
152
|
return;
|
|
126
153
|
}
|
|
127
|
-
const
|
|
128
|
-
const
|
|
154
|
+
const currentStartTime = e.ts;
|
|
155
|
+
const currentEndTime = e.ts + (e.dur ?? 0);
|
|
156
|
+
const actualEndTime = Math.min(currentEndTime, endTime);
|
|
157
|
+
const duration = Types.Timing.Micro(actualEndTime - Math.max(startTime, currentStartTime));
|
|
129
158
|
if (duration < 0) {
|
|
130
159
|
console.error('Negative event duration');
|
|
131
160
|
}
|
|
@@ -134,7 +163,7 @@ export class TopDownNode extends Node {
|
|
|
134
163
|
function onInstantEvent(e) {
|
|
135
164
|
++depth;
|
|
136
165
|
if (matchedDepth === path.length && depth <= path.length + 2) {
|
|
137
|
-
processEvent(e, 0);
|
|
166
|
+
processEvent(e, Types.Timing.Micro(0));
|
|
138
167
|
}
|
|
139
168
|
--depth;
|
|
140
169
|
}
|
|
@@ -147,7 +176,7 @@ export class TopDownNode extends Node {
|
|
|
147
176
|
return;
|
|
148
177
|
}
|
|
149
178
|
currentDirectChild.setHasChildren(true);
|
|
150
|
-
currentDirectChild.selfTime
|
|
179
|
+
currentDirectChild.selfTime = Types.Timing.Micro(currentDirectChild.selfTime - duration);
|
|
151
180
|
return;
|
|
152
181
|
}
|
|
153
182
|
let id;
|
|
@@ -171,8 +200,8 @@ export class TopDownNode extends Node {
|
|
|
171
200
|
else {
|
|
172
201
|
node.events.push(e);
|
|
173
202
|
}
|
|
174
|
-
node.selfTime
|
|
175
|
-
node.totalTime
|
|
203
|
+
node.selfTime = Types.Timing.Micro(node.selfTime + duration);
|
|
204
|
+
node.totalTime = Types.Timing.Micro(node.totalTime + duration);
|
|
176
205
|
if (Types.Events.isReceivedDataEvent(e)) {
|
|
177
206
|
node.transferSize += e.args.data.encodedDataLength;
|
|
178
207
|
}
|
|
@@ -185,14 +214,14 @@ export class TopDownNode extends Node {
|
|
|
185
214
|
* is cached on `matchedDepth`, for future checks.
|
|
186
215
|
*/
|
|
187
216
|
function matchPath(e) {
|
|
188
|
-
const { endTime } = Helpers.Timing.eventTimingsMilliSeconds(e);
|
|
189
217
|
if (matchedDepth === path.length) {
|
|
190
218
|
return true;
|
|
191
219
|
}
|
|
192
220
|
if (matchedDepth !== depth - 1) {
|
|
193
221
|
return false;
|
|
194
222
|
}
|
|
195
|
-
|
|
223
|
+
const eventEndTime = e.ts + (e.dur ?? 0);
|
|
224
|
+
if (!eventEndTime) {
|
|
196
225
|
return false;
|
|
197
226
|
}
|
|
198
227
|
if (!eventIdCallback) {
|
|
@@ -216,6 +245,9 @@ export class TopDownNode extends Node {
|
|
|
216
245
|
if (matchedDepth > depth) {
|
|
217
246
|
matchedDepth = depth;
|
|
218
247
|
}
|
|
248
|
+
if (depth === path.length) {
|
|
249
|
+
currentDirectChild = null;
|
|
250
|
+
}
|
|
219
251
|
}
|
|
220
252
|
this.childrenInternal = children;
|
|
221
253
|
return children;
|
|
@@ -229,20 +261,19 @@ export class TopDownRootNode extends TopDownNode {
|
|
|
229
261
|
/** Default behavior is to aggregate similar trace events into one Node based on generateEventID(), eventGroupIdCallback(), etc. Set true to keep nodes 1:1 with events. */
|
|
230
262
|
doNotAggregate;
|
|
231
263
|
includeInstantEvents;
|
|
232
|
-
|
|
233
|
-
selfTime;
|
|
264
|
+
eventId = createEventIdCache();
|
|
234
265
|
constructor(events, { filters, startTime, endTime, doNotAggregate, eventGroupIdCallback, includeInstantEvents }) {
|
|
235
266
|
super('', events[0], null);
|
|
236
267
|
this.event = events[0];
|
|
237
268
|
this.root = this;
|
|
238
269
|
this.events = events;
|
|
239
|
-
this.filter = (
|
|
270
|
+
this.filter = buildEventFilter(filters);
|
|
240
271
|
this.startTime = startTime;
|
|
241
272
|
this.endTime = endTime;
|
|
242
273
|
this.eventGroupIdCallback = eventGroupIdCallback;
|
|
243
274
|
this.doNotAggregate = doNotAggregate;
|
|
244
275
|
this.includeInstantEvents = includeInstantEvents;
|
|
245
|
-
this.totalTime = endTime - startTime;
|
|
276
|
+
this.totalTime = Types.Timing.Micro(endTime - startTime);
|
|
246
277
|
this.selfTime = this.totalTime;
|
|
247
278
|
}
|
|
248
279
|
children() {
|
|
@@ -252,7 +283,7 @@ export class TopDownRootNode extends TopDownNode {
|
|
|
252
283
|
grouppedTopNodes() {
|
|
253
284
|
const flatNodes = super.children();
|
|
254
285
|
for (const node of flatNodes.values()) {
|
|
255
|
-
this.selfTime
|
|
286
|
+
this.selfTime = Types.Timing.Micro(this.selfTime - node.totalTime);
|
|
256
287
|
}
|
|
257
288
|
if (!this.eventGroupIdCallback) {
|
|
258
289
|
return flatNodes;
|
|
@@ -308,20 +339,20 @@ export class BottomUpRootNode extends Node {
|
|
|
308
339
|
filter;
|
|
309
340
|
startTime;
|
|
310
341
|
endTime;
|
|
311
|
-
totalTime;
|
|
312
342
|
eventGroupIdCallback;
|
|
313
343
|
calculateTransferSize;
|
|
314
344
|
forceGroupIdCallback;
|
|
345
|
+
eventId = createEventIdCache();
|
|
315
346
|
constructor(events, { textFilter, filters, startTime, endTime, eventGroupIdCallback, calculateTransferSize, forceGroupIdCallback, }) {
|
|
316
347
|
super('', events[0]);
|
|
317
348
|
this.childrenInternal = null;
|
|
318
349
|
this.events = events;
|
|
319
350
|
this.textFilter = textFilter;
|
|
320
|
-
this.filter = (
|
|
351
|
+
this.filter = buildEventFilter(filters);
|
|
321
352
|
this.startTime = startTime;
|
|
322
353
|
this.endTime = endTime;
|
|
323
354
|
this.eventGroupIdCallback = eventGroupIdCallback;
|
|
324
|
-
this.totalTime = endTime - startTime;
|
|
355
|
+
this.totalTime = Types.Timing.Micro(endTime - startTime);
|
|
325
356
|
this.calculateTransferSize = calculateTransferSize;
|
|
326
357
|
this.forceGroupIdCallback = forceGroupIdCallback;
|
|
327
358
|
}
|
|
@@ -351,54 +382,41 @@ export class BottomUpRootNode extends Node {
|
|
|
351
382
|
const root = this;
|
|
352
383
|
const startTime = this.startTime;
|
|
353
384
|
const endTime = this.endTime;
|
|
354
|
-
const
|
|
385
|
+
const stateStack = [];
|
|
355
386
|
const nodeById = new Map();
|
|
356
|
-
const selfTimeStack = [endTime - startTime];
|
|
387
|
+
const selfTimeStack = [Types.Timing.Micro(endTime - startTime)];
|
|
357
388
|
const firstNodeStack = [];
|
|
358
|
-
const totalTimeById = new Map();
|
|
359
389
|
// TODO(paulirish): rename to getGroupNodeId
|
|
360
390
|
const eventGroupIdCallback = this.eventGroupIdCallback;
|
|
361
391
|
const forceGroupIdCallback = this.forceGroupIdCallback;
|
|
362
|
-
|
|
363
|
-
//
|
|
364
|
-
//
|
|
365
|
-
//
|
|
366
|
-
const
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
const nodeIdForEvent = (e) => {
|
|
371
|
-
let id;
|
|
372
|
-
if (Types.Events.isProfileCall(e)) {
|
|
373
|
-
// Profile calls for the same frame share one callFrame object, and
|
|
374
|
-
// their ID only depends on its fields.
|
|
375
|
-
const cachedId = profileCallIdByCallFrame.get(e.callFrame);
|
|
376
|
-
if (cachedId === undefined) {
|
|
377
|
-
id = generateEventID(e);
|
|
378
|
-
profileCallIdByCallFrame.set(e.callFrame, id);
|
|
379
|
-
}
|
|
380
|
-
else {
|
|
381
|
-
id = cachedId;
|
|
382
|
-
}
|
|
383
|
-
}
|
|
384
|
-
else {
|
|
385
|
-
id = generateEventID(e);
|
|
386
|
-
}
|
|
392
|
+
const eventId = this.eventId;
|
|
393
|
+
// Group IDs are looked up first by base event ID and then by group ID,
|
|
394
|
+
// storing the state object directly so steady-state events need no node
|
|
395
|
+
// map lookup or string concatenation.
|
|
396
|
+
const stateById = new Map();
|
|
397
|
+
const groupedStatesByEventId = new Map();
|
|
398
|
+
const stateForEvent = (e) => {
|
|
399
|
+
const id = eventId(e);
|
|
387
400
|
if (!forceGroupIdCallback || !eventGroupIdCallback) {
|
|
388
|
-
|
|
401
|
+
let state = stateById.get(id);
|
|
402
|
+
if (!state) {
|
|
403
|
+
state = { id, node: null, onStack: false, pendingTotalTime: Types.Timing.Micro(0) };
|
|
404
|
+
stateById.set(id, state);
|
|
405
|
+
}
|
|
406
|
+
return state;
|
|
389
407
|
}
|
|
390
408
|
const groupId = eventGroupIdCallback(e);
|
|
391
|
-
let
|
|
392
|
-
if (!
|
|
393
|
-
|
|
394
|
-
|
|
409
|
+
let groupedStates = groupedStatesByEventId.get(id);
|
|
410
|
+
if (!groupedStates) {
|
|
411
|
+
groupedStates = new Map();
|
|
412
|
+
groupedStatesByEventId.set(id, groupedStates);
|
|
395
413
|
}
|
|
396
|
-
let
|
|
397
|
-
if (
|
|
398
|
-
|
|
399
|
-
|
|
414
|
+
let state = groupedStates.get(groupId);
|
|
415
|
+
if (!state) {
|
|
416
|
+
state = { id: `${id}-${groupId}`, node: null, onStack: false, pendingTotalTime: Types.Timing.Micro(0) };
|
|
417
|
+
groupedStates.set(groupId, state);
|
|
400
418
|
}
|
|
401
|
-
return
|
|
419
|
+
return state;
|
|
402
420
|
};
|
|
403
421
|
// Evaluated lazily on the first relevant event to avoid a WeakMap lookup or
|
|
404
422
|
// full-trace scan when the time window contains no network data events.
|
|
@@ -406,11 +424,12 @@ export class BottomUpRootNode extends Node {
|
|
|
406
424
|
// encodedDataLength is provided solely on instant events.
|
|
407
425
|
const sumTransferSizeOfInstantEvent = (e) => {
|
|
408
426
|
if (Types.Events.isReceivedDataEvent(e)) {
|
|
409
|
-
const
|
|
410
|
-
let node =
|
|
427
|
+
const state = stateForEvent(e);
|
|
428
|
+
let node = state.node;
|
|
411
429
|
if (!node) {
|
|
412
|
-
node = new BottomUpNode(root, id, e, false, root);
|
|
413
|
-
|
|
430
|
+
node = new BottomUpNode(root, state.id, e, false, root);
|
|
431
|
+
state.node = node;
|
|
432
|
+
nodeById.set(state.id, node);
|
|
414
433
|
}
|
|
415
434
|
else {
|
|
416
435
|
node.events.push(e);
|
|
@@ -449,54 +468,57 @@ export class BottomUpRootNode extends Node {
|
|
|
449
468
|
onStartEvent,
|
|
450
469
|
onEndEvent,
|
|
451
470
|
onInstantEvent: this.calculateTransferSize ? sumTransferSizeOfInstantEvent : undefined,
|
|
452
|
-
startTime:
|
|
453
|
-
endTime:
|
|
471
|
+
startTime: this.startTime,
|
|
472
|
+
endTime: this.endTime,
|
|
454
473
|
eventFilter: this.filter,
|
|
455
474
|
ignoreAsyncEvents: false,
|
|
456
475
|
});
|
|
457
476
|
function onStartEvent(e) {
|
|
458
|
-
const
|
|
459
|
-
const
|
|
460
|
-
const
|
|
461
|
-
|
|
477
|
+
const currentStartTime = e.ts;
|
|
478
|
+
const currentEndTime = e.ts + (e.dur ?? 0);
|
|
479
|
+
const actualEndTime = Math.min(currentEndTime, endTime);
|
|
480
|
+
const duration = Types.Timing.Micro(actualEndTime - Math.max(currentStartTime, startTime));
|
|
481
|
+
selfTimeStack[selfTimeStack.length - 1] = Types.Timing.Micro(selfTimeStack[selfTimeStack.length - 1] - duration);
|
|
462
482
|
selfTimeStack.push(duration);
|
|
463
|
-
const
|
|
464
|
-
|
|
483
|
+
const state = stateForEvent(e);
|
|
484
|
+
stateStack.push(state);
|
|
465
485
|
// For an event 'X' that contains another event 'X' (resolving to the same node
|
|
466
486
|
// id), we need to measure `totalTime` from the start of the outermost 'X' to
|
|
467
487
|
// its corresponding end. This logic ensures we don't double-count the duration
|
|
468
488
|
// of the inner event.
|
|
469
|
-
const noNodeOnStack = !
|
|
489
|
+
const noNodeOnStack = !state.onStack;
|
|
470
490
|
if (noNodeOnStack) {
|
|
471
|
-
|
|
491
|
+
state.onStack = true;
|
|
492
|
+
state.pendingTotalTime = duration;
|
|
472
493
|
}
|
|
473
494
|
firstNodeStack.push(noNodeOnStack);
|
|
474
495
|
}
|
|
475
496
|
function onEndEvent(event) {
|
|
476
|
-
const
|
|
477
|
-
if (
|
|
497
|
+
const state = stateStack.pop();
|
|
498
|
+
if (!state) {
|
|
478
499
|
return;
|
|
479
500
|
}
|
|
480
|
-
let node =
|
|
501
|
+
let node = state.node;
|
|
481
502
|
if (!node) {
|
|
482
|
-
node = new BottomUpNode(root, id, event, false, root);
|
|
483
|
-
|
|
503
|
+
node = new BottomUpNode(root, state.id, event, false, root);
|
|
504
|
+
state.node = node;
|
|
505
|
+
nodeById.set(state.id, node);
|
|
484
506
|
}
|
|
485
507
|
else {
|
|
486
508
|
node.events.push(event);
|
|
487
509
|
}
|
|
488
|
-
node.selfTime
|
|
510
|
+
node.selfTime = Types.Timing.Micro(node.selfTime + (selfTimeStack.pop() || 0));
|
|
489
511
|
if (firstNodeStack.pop()) {
|
|
490
|
-
node.totalTime
|
|
491
|
-
|
|
512
|
+
node.totalTime = Types.Timing.Micro(node.totalTime + state.pendingTotalTime);
|
|
513
|
+
state.onStack = false;
|
|
492
514
|
}
|
|
493
515
|
// An item on this stack means that this current node has a caller. Therefore,
|
|
494
516
|
// in a bottom-up view it has children.
|
|
495
|
-
if (
|
|
517
|
+
if (stateStack.length > 0) {
|
|
496
518
|
node.setHasChildren(true);
|
|
497
519
|
}
|
|
498
520
|
}
|
|
499
|
-
this.selfTime = selfTimeStack.pop() || 0;
|
|
521
|
+
this.selfTime = Types.Timing.Micro(selfTimeStack.pop() || 0);
|
|
500
522
|
// Delete any nodes that have no selfTime (or transferSize, if it's being calculated)
|
|
501
523
|
for (const pair of nodeById) {
|
|
502
524
|
if (pair[1].selfTime <= 0 && (!this.calculateTransferSize || pair[1].transferSize <= 0)) {
|
|
@@ -541,8 +563,8 @@ export class GroupNode extends Node {
|
|
|
541
563
|
}
|
|
542
564
|
addChild(child, selfTime, totalTime, transferSize) {
|
|
543
565
|
this.childrenInternal.set(child.id, child);
|
|
544
|
-
this.selfTime
|
|
545
|
-
this.totalTime
|
|
566
|
+
this.selfTime = Types.Timing.Micro(this.selfTime + selfTime);
|
|
567
|
+
this.totalTime = Types.Timing.Micro(this.totalTime + totalTime);
|
|
546
568
|
this.transferSize += transferSize;
|
|
547
569
|
child.parent = this;
|
|
548
570
|
}
|
|
@@ -577,37 +599,38 @@ export class BottomUpNode extends Node {
|
|
|
577
599
|
if (this.cachedChildren) {
|
|
578
600
|
return this.cachedChildren;
|
|
579
601
|
}
|
|
580
|
-
const selfTimeStack = [0];
|
|
602
|
+
const selfTimeStack = [Types.Timing.Micro(0)];
|
|
581
603
|
const eventIdStack = [];
|
|
582
604
|
const eventStack = [];
|
|
583
605
|
const nodeById = new Map();
|
|
584
606
|
const startTime = this.root.startTime;
|
|
585
607
|
const endTime = this.root.endTime;
|
|
608
|
+
const eventId = this.root.eventId;
|
|
586
609
|
let lastTimeMarker = startTime;
|
|
587
610
|
const self = this;
|
|
588
611
|
Helpers.Trace.forEachEvent(this.root.events, {
|
|
589
612
|
onStartEvent,
|
|
590
613
|
onEndEvent,
|
|
591
|
-
startTime
|
|
592
|
-
endTime
|
|
614
|
+
startTime,
|
|
615
|
+
endTime,
|
|
593
616
|
eventFilter: this.root.filter,
|
|
594
617
|
ignoreAsyncEvents: false,
|
|
595
618
|
});
|
|
596
619
|
function onStartEvent(e) {
|
|
597
|
-
const
|
|
598
|
-
const
|
|
599
|
-
const
|
|
620
|
+
const currentStartTime = e.ts;
|
|
621
|
+
const currentEndTime = e.ts + (e.dur ?? 0);
|
|
622
|
+
const actualEndTime = Math.min(currentEndTime, endTime);
|
|
623
|
+
const duration = Types.Timing.Micro(actualEndTime - Math.max(currentStartTime, startTime));
|
|
600
624
|
if (duration < 0) {
|
|
601
625
|
console.assert(false, 'Negative duration of an event');
|
|
602
626
|
}
|
|
603
|
-
selfTimeStack[selfTimeStack.length - 1]
|
|
627
|
+
selfTimeStack[selfTimeStack.length - 1] = Types.Timing.Micro(selfTimeStack[selfTimeStack.length - 1] - duration);
|
|
604
628
|
selfTimeStack.push(duration);
|
|
605
|
-
const id =
|
|
629
|
+
const id = eventId(e);
|
|
606
630
|
eventIdStack.push(id);
|
|
607
631
|
eventStack.push(e);
|
|
608
632
|
}
|
|
609
633
|
function onEndEvent(e) {
|
|
610
|
-
const { startTime: currentStartTime, endTime: currentEndTime } = Helpers.Timing.eventTimingsMilliSeconds(e);
|
|
611
634
|
const selfTime = selfTimeStack.pop();
|
|
612
635
|
const id = eventIdStack.pop();
|
|
613
636
|
eventStack.pop();
|
|
@@ -631,10 +654,12 @@ export class BottomUpNode extends Node {
|
|
|
631
654
|
else {
|
|
632
655
|
node.events.push(e);
|
|
633
656
|
}
|
|
634
|
-
const
|
|
635
|
-
const
|
|
636
|
-
|
|
637
|
-
|
|
657
|
+
const currentStartTime = e.ts;
|
|
658
|
+
const currentEndTime = e.ts + (e.dur ?? 0);
|
|
659
|
+
const actualEndTime = Types.Timing.Micro(Math.min(currentEndTime, endTime));
|
|
660
|
+
const totalTime = Types.Timing.Micro(actualEndTime - Math.max(currentStartTime, lastTimeMarker));
|
|
661
|
+
node.selfTime = Types.Timing.Micro(node.selfTime + (selfTime || 0));
|
|
662
|
+
node.totalTime = Types.Timing.Micro(node.totalTime + totalTime);
|
|
638
663
|
lastTimeMarker = actualEndTime;
|
|
639
664
|
}
|
|
640
665
|
this.cachedChildren = this.root.filterChildren(nodeById);
|