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

Jump to bottom

core(lantern): extract main thread events w/o TraceProcessor #16049

Merged
merged 4 commits into from
Jun 10, 2024
Merged

core(lantern): extract main thread events w/o TraceProcessor #16049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
738389b
core(lantern): extract main thread events without LH TraceProcessor
connorjclark Jun 7, 2024
7115c63
fix _collectMainThreadEvents
connorjclark Jun 7, 2024
a4bd8b7
accidentally stopped using _filteredTraceSort
connorjclark Jun 7, 2024
32a9f13
rm _filteredTraceSort
connorjclark Jun 8, 2024
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
2 changes: 1 addition & 1 deletion core/computed/page-dependency-graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class PageDependencyGraph {
if (data.fromTrace) {
const traceEngineResult = await TraceEngineResult.request({trace}, context);
const {graph} = await LanternPageDependencyGraph.createGraphFromTrace(
mainThreadEvents, trace, traceEngineResult, URL);
trace, traceEngineResult, URL);
return graph;
}

Expand Down
44 changes: 42 additions & 2 deletions core/lib/lantern/page-dependency-graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,12 +785,52 @@
}

/**
* @param {LH.TraceEvent[]} mainThreadEvents
* @param {LH.Trace} trace
* @param {LH.Artifacts.TraceEngineResult} traceEngineResult
* @return {LH.TraceEvent[]}
*/
static _collectMainThreadEvents(trace, traceEngineResult) {
const Meta = traceEngineResult.data.Meta;
const mainFramePids = Meta.mainFrameNavigations.length
? new Set(Meta.mainFrameNavigations.map(nav => nav.pid))
: Meta.topLevelRendererIds;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just use Meta.topLevelRendererIds all the time? Seems like it represents what we want?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see #16049 (comment)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving cuz I'm kinda just throwing ideas against the wall but I also saw rendererProcessesByFrame in the trace processor. It isn't fed by main frame navigations but it is fed by CommitLoad which seems similar.


const rendererPidToTid = new Map();
for (const pid of mainFramePids) {
const threads = Meta.threadsInProcess.get(pid) ?? [];

let found = false;
for (const [tid, thread] of threads) {
if (thread.args.name === 'CrRendererMain') {
rendererPidToTid.set(pid, tid);
found = true;
break;
}
}

if (found) continue;

// `CrRendererMain` can be missing if chrome is launched with the `--single-process` flag.
// In this case, page tasks will be run in the browser thread.
for (const [tid, thread] of threads) {
if (thread.args.name === 'CrBrowserMain') {
rendererPidToTid.set(pid, tid);
found = true;
break;
}
}
}

Check warning on line 822 in core/lib/lantern/page-dependency-graph.js

View check run for this annotation

Codecov / codecov/patch

core/lib/lantern/page-dependency-graph.js#L812-L822 

Added lines #L812 - L822 were not covered by tests

return trace.traceEvents.filter(e => rendererPidToTid.get(e.pid) === e.tid);
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

w/o _filteredTraceSort(instead of just array.filter) no tests fail ... so is it needed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's needed. I looked at how we use main thread events in lantern and we just look for top level CPU tasks. Those should really never have the same timestamp which seems to be the purpose of that function.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems convincing


/**
* @param {LH.Trace} trace
* @param {LH.Artifacts.TraceEngineResult} traceEngineResult
* @param {LH.Artifacts.URL} URL
*/
static async createGraphFromTrace(mainThreadEvents, trace, traceEngineResult, URL) {
static async createGraphFromTrace(trace, traceEngineResult, URL) {
const mainThreadEvents = this._collectMainThreadEvents(trace, traceEngineResult);
const workerThreads = this._findWorkerThreads(trace);

/** @type {Lantern.NetworkRequest[]} */
Expand Down
16 changes: 2 additions & 14 deletions core/test/lib/lantern/metrics/metric-test-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* SPDX-License-Identifier: Apache-2.0
*/

import {ProcessedTrace} from '../../../../computed/processed-trace.js';
import {TraceEngineResult} from '../../../../computed/trace-engine-result.js';
import {createProcessedNavigation} from '../../../../lib/lantern/lantern.js';
import {PageDependencyGraph} from '../../../../lib/lantern/page-dependency-graph.js';
Expand All @@ -17,18 +16,6 @@ import {getURLArtifactFromDevtoolsLog} from '../../../test-utils.js';

// TODO(15841): remove usage of Lighthouse code to create test data

/**
* @param {LH.Artifacts.TraceEngineResult} traceEngineResult
* @param {LH.Artifacts.URL} theURL
* @param {LH.Trace} trace
* @param {LH.Artifacts.ComputedContext} context
*/
async function createGraph(traceEngineResult, theURL, trace, context) {
const {mainThreadEvents} = await ProcessedTrace.request(trace, context);
return PageDependencyGraph.createGraphFromTrace(
mainThreadEvents, trace, traceEngineResult, theURL);
}

/**
* @param {{trace: LH.Trace, devtoolsLog: LH.DevtoolsLog, settings?: LH.Config.Settings, URL?: LH.Artifacts.URL}} opts
*/
Expand All @@ -39,7 +26,8 @@ async function getComputationDataFromFixture({trace, devtoolsLog, settings, URL}

const context = {settings, computedCache: new Map()};
const traceEngineResult = await TraceEngineResult.request({trace}, context);
const {graph, records} = await createGraph(traceEngineResult, URL, trace, context);
const {graph, records} =
await PageDependencyGraph.createGraphFromTrace(trace, traceEngineResult, URL);
const processedNavigation = createProcessedNavigation(traceEngineResult);
const networkAnalysis = NetworkAnalyzer.analyze(records);
const simulator = Simulator.createSimulator({...settings, networkAnalysis});
Expand Down
Loading