Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core(tracehouse): sort trace events by nesting order #9230

Merged
merged 6 commits into from
Aug 5, 2019
Merged

core(tracehouse): sort trace events by nesting order #9230

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4852262
core(tracehouse): sort trace events by nesting order
patrickhulce Jun 18, 2019
575aa1d
Merge branch 'master' into sort_same_ts
patrickhulce Jul 30, 2019
5db102d
feedback
patrickhulce Jul 30, 2019
79a53fe
lint
patrickhulce Jul 30, 2019
30b5eb7
clarify index types
patrickhulce Aug 1, 2019
28876ba
add comment about trace size
patrickhulce Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions lighthouse-core/lib/tracehouse/trace-processor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,30 +86,30 @@ class TraceProcessor {
const otherEventIndices = tsGroupIndices.filter(index => !eEventIndices.includes(index) &&
!bxEventIndices.includes(index));

/** @type {Map<number, number>} */
const effectiveDuration = new Map();
for (const index of bxEventIndices) {
const event = traceEvents[index];
if (event.ph === 'X') {
effectiveDuration.set(index, event.dur);
} else {
// Find the first 'E' event that matches our name.
// Find the first 'E' event *after* the current group of events that matches our name.
let duration = Number.MAX_SAFE_INTEGER;
const startIndex = indexOfTsGroupIndicesStart + tsGroupIndices.length;
for (let j = startIndex; j < timestampSortedIndices.length; j++) {
const potentialEndEvent = traceEvents[timestampSortedIndices[j]];
if (potentialEndEvent.ph === 'E' && potentialEndEvent.name === event.name) {
effectiveDuration.set(index, potentialEndEvent.ts - event.ts);
duration = potentialEndEvent.ts - event.ts;
break;
}
}

if (!effectiveDuration.has(index)) {
effectiveDuration.set(index, Number.MAX_SAFE_INTEGER);
}
effectiveDuration.set(index, duration);
}
}

bxEventIndices.sort((indexA, indexB) => (effectiveDuration.get(indexB) -
effectiveDuration.get(indexA) || (indexA - indexB)));
bxEventIndices.sort((indexA, indexB) => ((effectiveDuration.get(indexB) || 0) -
(effectiveDuration.get(indexA) || 0) || (indexA - indexB)));

otherEventIndices.sort((indexA, indexB) => indexA - indexB);

Expand Down Expand Up @@ -155,6 +155,9 @@ class TraceProcessor {
traceEvents,
)
indices.splice(i, finalIndexOrder.length, ...finalIndexOrder);
// We just sorted this set of identical timestamps, so skip over the rest of the group.
// -1 because we already have i++.
i += tsGroupIndices.length - 1;
}

// create a new array using the target indices from previous sort step
Expand Down