googlechrome
/
lighthouse
зеркало из https://github.com/GoogleChrome/lighthouse.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

core(lantern): rename Simulation.Result.nodeTiming to be plural (#5038)

This commit is contained in:
Paul Irish 2018-04-25 14:23:11 -07:00 коммит произвёл Patrick Hulce
Родитель 1957caec83
Коммит f82680f249
16 изменённых файлов: 49 добавлений и 49 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js
Просмотреть файл

@ -129,8 +129,8 @@ class UnusedBytes extends Audit {
});
const savingsOnTTI = Math.max(
ConsistentlyInteractive.getLastLongTaskEndTime(simulationBeforeChanges.nodeTiming) -
ConsistentlyInteractive.getLastLongTaskEndTime(simulationAfterChanges.nodeTiming),
ConsistentlyInteractive.getLastLongTaskEndTime(simulationBeforeChanges.nodeTimings) -
ConsistentlyInteractive.getLastLongTaskEndTime(simulationAfterChanges.nodeTimings),
0
);

12
lighthouse-core/audits/byte-efficiency/render-blocking-resources.js
Просмотреть файл

@ -23,14 +23,14 @@ const WebInspector = require('../../lib/web-inspector');
const MINIMUM_WASTED_MS = 50;
/**
* Given a simulation's nodeTiming, return an object with the nodes/timing keyed by network URL
* @param {LH.Gatherer.Simulation.Result['nodeTiming']} nodeTimingMap
* Given a simulation's nodeTimings, return an object with the nodes/timing keyed by network URL
* @param {LH.Gatherer.Simulation.Result['nodeTimings']} nodeTimings
* @return {Object<string, {node: Node, nodeTiming: LH.Gatherer.Simulation.NodeTiming}>}
*/
const getNodesAndTimingByUrl = nodeTimingMap => {
const nodes = Array.from(nodeTimingMap.keys());
const getNodesAndTimingByUrl = nodeTimings => {
const nodes = Array.from(nodeTimings.keys());
return nodes.reduce((map, node) => {
map[node.record && node.record.url] = {node, nodeTiming: nodeTimingMap.get(node)};
map[node.record && node.record.url] = {node, nodeTiming: nodeTimings.get(node)};
return map;
}, {});
};
@ -70,7 +70,7 @@ class RenderBlockingResources extends Audit {
const fcpSimulation = await artifacts.requestFirstContentfulPaint(metricComputationData);
const fcpTsInMs = traceOfTab.timestamps.firstContentfulPaint / 1000;
const nodesByUrl = getNodesAndTimingByUrl(fcpSimulation.optimisticEstimate.nodeTiming);
const nodesByUrl = getNodesAndTimingByUrl(fcpSimulation.optimisticEstimate.nodeTimings);
const results = [];
const deferredNodeIds = new Set();

10
lighthouse-core/gather/computed/metrics/lantern-consistently-interactive.js
Просмотреть файл

@ -71,13 +71,13 @@ class ConsistentlyInteractive extends MetricArtifact {
* @return {LH.Gatherer.Simulation.Result}
*/
getEstimateFromSimulation(simulationResult, extras) {
const lastTaskAt = ConsistentlyInteractive.getLastLongTaskEndTime(simulationResult.nodeTiming);
const lastTaskAt = ConsistentlyInteractive.getLastLongTaskEndTime(simulationResult.nodeTimings);
const minimumTime = extras.optimistic
? extras.fmpResult.optimisticEstimate.timeInMs
: extras.fmpResult.pessimisticEstimate.timeInMs;
return {
timeInMs: Math.max(minimumTime, lastTaskAt),
nodeTiming: simulationResult.nodeTiming,
nodeTimings: simulationResult.nodeTimings,
};
}
@ -94,12 +94,12 @@ class ConsistentlyInteractive extends MetricArtifact {
}
/**
* @param {Map<Node, {startTime?: number, endTime?: number}>} nodeTiming
* @param {Map<Node, LH.Gatherer.Simulation.NodeTiming>} nodeTimings
* @return {number}
*/
static getLastLongTaskEndTime(nodeTiming, duration = 50) {
static getLastLongTaskEndTime(nodeTimings, duration = 50) {
// @ts-ignore TS can't infer how the object invariants change
return Array.from(nodeTiming.entries())
return Array.from(nodeTimings.entries())
.filter(([node, timing]) => {
if (node.type !== Node.TYPES.CPU) return false;
if (!timing.endTime || !timing.startTime) return false;

10
lighthouse-core/gather/computed/metrics/lantern-first-cpu-idle.js
Просмотреть файл

@ -28,20 +28,20 @@ class LanternFirstCPUIdle extends LanternConsistentlyInteractive {
: extras.fmpResult.pessimisticEstimate.timeInMs;
return {
timeInMs: LanternFirstCPUIdle.getFirstCPUIdleWindowStart(simulation.nodeTiming, fmpTimeInMs),
nodeTiming: simulation.nodeTiming,
timeInMs: LanternFirstCPUIdle.getFirstCPUIdleWindowStart(simulation.nodeTimings, fmpTimeInMs),
nodeTimings: simulation.nodeTimings,
};
}
/**
*
* @param {Map<Node, LH.Gatherer.Simulation.NodeTiming>} nodeTiming
* @param {Map<Node, LH.Gatherer.Simulation.NodeTiming>} nodeTimings
* @param {number} fmpTimeInMs
*/
static getFirstCPUIdleWindowStart(nodeTiming, fmpTimeInMs, longTaskLength = 50) {
static getFirstCPUIdleWindowStart(nodeTimings, fmpTimeInMs, longTaskLength = 50) {
/** @type {Array<{start: number, end: number}>} */
const longTasks = [];
for (const [node, timing] of nodeTiming.entries()) {
for (const [node, timing] of nodeTimings.entries()) {
if (node.type !== Node.TYPES.CPU) continue;
if (!timing.endTime || !timing.startTime) continue;
if (timing.endTime - timing.startTime < longTaskLength) continue;

10
lighthouse-core/gather/computed/metrics/lantern-speed-index.js
Просмотреть файл

@ -50,10 +50,10 @@ class SpeedIndex extends MetricArtifact {
const fcpTimeInMs = extras.fcpResult.timing;
const estimate = extras.optimistic
? extras.speedline.speedIndex
: SpeedIndex.computeLayoutBasedSpeedIndex(simulationResult.nodeTiming, fcpTimeInMs);
: SpeedIndex.computeLayoutBasedSpeedIndex(simulationResult.nodeTimings, fcpTimeInMs);
return {
timeInMs: estimate,
nodeTiming: simulationResult.nodeTiming,
nodeTimings: simulationResult.nodeTimings,
};
}
@ -84,14 +84,14 @@ class SpeedIndex extends MetricArtifact {
* different methods. Read more in the evaluation doc.
*
* @see https://docs.google.com/document/d/1qJWXwxoyVLVadezIp_Tgdk867G3tDNkkVRvUJSH3K1E/edit#
* @param {Map<Node, LH.Gatherer.Simulation.NodeTiming>} nodeTiming
* @param {Map<Node, LH.Gatherer.Simulation.NodeTiming>} nodeTimings
* @param {number} fcpTimeInMs
* @return {number}
*/
static computeLayoutBasedSpeedIndex(nodeTiming, fcpTimeInMs) {
static computeLayoutBasedSpeedIndex(nodeTimings, fcpTimeInMs) {
/** @type {Array<{time: number, weight: number}>} */
const layoutWeights = [];
for (const [node, timing] of nodeTiming.entries()) {
for (const [node, timing] of nodeTimings.entries()) {
if (node.type !== Node.TYPES.CPU) continue;
if (!timing.startTime || !timing.endTime) continue;

16
lighthouse-core/lib/dependency-graph/simulator/simulator.js
Просмотреть файл

@ -52,7 +52,7 @@ class Simulator {
this._layoutTaskMultiplier = this._cpuSlowdownMultiplier * this._options.layoutTaskMultiplier;
// Properties reset on every `.simulate` call but duplicated here for type checking
this._nodeTiming = new Map();
this._nodeTimings = new Map();
this._numberInProgressByType = new Map();
this._nodes = {};
// @ts-ignore
@ -78,7 +78,7 @@ class Simulator {
* Initializes the various state data structures such as _nodesReadyToStart and _nodesCompleted.
*/
_initializeAuxiliaryData() {
this._nodeTiming = new Map();
this._nodeTimings = new Map();
this._numberInProgressByType = new Map();
this._nodes = {};
@ -100,9 +100,9 @@ class Simulator {
* @param {LH.Gatherer.Simulation.NodeTiming} values
*/
_setTimingData(node, values) {
const timingData = this._nodeTiming.get(node) || {};
const timingData = this._nodeTimings.get(node) || {};
Object.assign(timingData, values);
this._nodeTiming.set(node, timingData);
this._nodeTimings.set(node, timingData);
}
/**
@ -195,7 +195,7 @@ class Simulator {
*/
_estimateTimeRemaining(node) {
if (node.type === Node.TYPES.CPU) {
const timingData = this._nodeTiming.get(node);
const timingData = this._nodeTimings.get(node);
const multiplier = /** @type {CpuNode} */ (node).didPerformLayout()
? this._layoutTaskMultiplier
: this._cpuSlowdownMultiplier;
@ -211,7 +211,7 @@ class Simulator {
if (node.type !== Node.TYPES.NETWORK) throw new Error('Unsupported');
const record = /** @type {NetworkNode} */ (node).record;
const timingData = this._nodeTiming.get(node);
const timingData = this._nodeTimings.get(node);
const connection = /** @type {TcpConnection} */ (this._connectionPool.acquire(record));
const calculation = connection.simulateDownloadUntil(
record.transferSize - timingData.bytesDownloaded,
@ -243,7 +243,7 @@ class Simulator {
* @param {number} totalElapsedTime
*/
_updateProgressMadeInTimePeriod(node, timePeriodLength, totalElapsedTime) {
const timingData = this._nodeTiming.get(node);
const timingData = this._nodeTimings.get(node);
const isFinished = timingData.estimatedTimeElapsed === timePeriodLength;
if (node.type === Node.TYPES.CPU) {
@ -329,7 +329,7 @@ class Simulator {
return {
timeInMs: totalElapsedTime,
nodeTiming: this._nodeTiming,
nodeTimings: this._nodeTimings,
};
}
}

4
lighthouse-core/test/gather/computed/metrics/consistently-interactive-test.js
Просмотреть файл

@ -37,8 +37,8 @@ describe('Metrics: TTCI', () => {
assert.equal(Math.round(result.timing), 5308);
assert.equal(Math.round(result.optimisticEstimate.timeInMs), 2451);
assert.equal(Math.round(result.pessimisticEstimate.timeInMs), 2752);
assert.equal(result.optimisticEstimate.nodeTiming.size, 19);
assert.equal(result.pessimisticEstimate.nodeTiming.size, 79);
assert.equal(result.optimisticEstimate.nodeTimings.size, 19);
assert.equal(result.pessimisticEstimate.nodeTimings.size, 79);
assert.ok(result.optimisticGraph, 'should have created optimistic graph');
assert.ok(result.pessimisticGraph, 'should have created pessimistic graph');
});

4
lighthouse-core/test/gather/computed/metrics/first-contentful-paint-test.js
Просмотреть файл

@ -22,8 +22,8 @@ describe('Metrics: FCP', () => {
assert.equal(Math.round(result.timing), 2038);
assert.equal(Math.round(result.optimisticEstimate.timeInMs), 611);
assert.equal(Math.round(result.pessimisticEstimate.timeInMs), 611);
assert.equal(result.optimisticEstimate.nodeTiming.size, 2);
assert.equal(result.pessimisticEstimate.nodeTiming.size, 2);
assert.equal(result.optimisticEstimate.nodeTimings.size, 2);
assert.equal(result.pessimisticEstimate.nodeTimings.size, 2);
assert.ok(result.optimisticGraph, 'should have created optimistic graph');
assert.ok(result.pessimisticGraph, 'should have created pessimistic graph');
});

4
lighthouse-core/test/gather/computed/metrics/first-cpu-idle-test.js
Просмотреть файл

@ -66,8 +66,8 @@ describe('FirstInteractive computed artifact:', () => {
assert.equal(Math.round(result.timing), 5308);
assert.equal(Math.round(result.optimisticEstimate.timeInMs), 2451);
assert.equal(Math.round(result.pessimisticEstimate.timeInMs), 2752);
assert.equal(result.optimisticEstimate.nodeTiming.size, 19);
assert.equal(result.pessimisticEstimate.nodeTiming.size, 79);
assert.equal(result.optimisticEstimate.nodeTimings.size, 19);
assert.equal(result.pessimisticEstimate.nodeTimings.size, 79);
assert.ok(result.optimisticGraph, 'should have created optimistic graph');
assert.ok(result.pessimisticGraph, 'should have created pessimistic graph');
});

4
lighthouse-core/test/gather/computed/metrics/first-meaningful-paint-test.js
Просмотреть файл

@ -42,8 +42,8 @@ describe('Metrics: FMP', () => {
assert.equal(Math.round(result.timing), 2851);
assert.equal(Math.round(result.optimisticEstimate.timeInMs), 911);
assert.equal(Math.round(result.pessimisticEstimate.timeInMs), 1198);
assert.equal(result.optimisticEstimate.nodeTiming.size, 4);
assert.equal(result.pessimisticEstimate.nodeTiming.size, 7);
assert.equal(result.optimisticEstimate.nodeTimings.size, 4);
assert.equal(result.pessimisticEstimate.nodeTimings.size, 7);
assert.ok(result.optimisticGraph, 'should have created optimistic graph');
assert.ok(result.pessimisticGraph, 'should have created pessimistic graph');
});

4
lighthouse-core/test/gather/computed/metrics/lantern-consistently-interactive-test.js
Просмотреть файл

@ -20,8 +20,8 @@ describe('Metrics: Lantern TTCI', () => {
assert.equal(Math.round(result.timing), 5308);
assert.equal(Math.round(result.optimisticEstimate.timeInMs), 2451);
assert.equal(Math.round(result.pessimisticEstimate.timeInMs), 2752);
assert.equal(result.optimisticEstimate.nodeTiming.size, 19);
assert.equal(result.pessimisticEstimate.nodeTiming.size, 79);
assert.equal(result.optimisticEstimate.nodeTimings.size, 19);
assert.equal(result.pessimisticEstimate.nodeTimings.size, 79);
assert.ok(result.optimisticGraph, 'should have created optimistic graph');
assert.ok(result.pessimisticGraph, 'should have created pessimistic graph');
});

4
lighthouse-core/test/gather/computed/metrics/lantern-first-contentful-paint-test.js
Просмотреть файл

@ -20,8 +20,8 @@ describe('Metrics: Lantern FCP', () => {
assert.equal(Math.round(result.timing), 2038);
assert.equal(Math.round(result.optimisticEstimate.timeInMs), 611);
assert.equal(Math.round(result.pessimisticEstimate.timeInMs), 611);
assert.equal(result.optimisticEstimate.nodeTiming.size, 2);
assert.equal(result.pessimisticEstimate.nodeTiming.size, 2);
assert.equal(result.optimisticEstimate.nodeTimings.size, 2);
assert.equal(result.pessimisticEstimate.nodeTimings.size, 2);
assert.ok(result.optimisticGraph, 'should have created optimistic graph');
assert.ok(result.pessimisticGraph, 'should have created pessimistic graph');
});

4
lighthouse-core/test/gather/computed/metrics/lantern-first-cpu-idle-test.js
Просмотреть файл

@ -20,8 +20,8 @@ describe('Metrics: Lantern TTFCPUI', () => {
assert.equal(Math.round(result.timing), 5308);
assert.equal(Math.round(result.optimisticEstimate.timeInMs), 2451);
assert.equal(Math.round(result.pessimisticEstimate.timeInMs), 2752);
assert.equal(result.optimisticEstimate.nodeTiming.size, 19);
assert.equal(result.pessimisticEstimate.nodeTiming.size, 79);
assert.equal(result.optimisticEstimate.nodeTimings.size, 19);
assert.equal(result.pessimisticEstimate.nodeTimings.size, 79);
assert.ok(result.optimisticGraph, 'should have created optimistic graph');
assert.ok(result.pessimisticGraph, 'should have created pessimistic graph');
});

4
lighthouse-core/test/gather/computed/metrics/lantern-first-meaningful-paint-test.js
Просмотреть файл

@ -20,8 +20,8 @@ describe('Metrics: Lantern FMP', () => {
assert.equal(Math.round(result.timing), 2851);
assert.equal(Math.round(result.optimisticEstimate.timeInMs), 911);
assert.equal(Math.round(result.pessimisticEstimate.timeInMs), 1198);
assert.equal(result.optimisticEstimate.nodeTiming.size, 4);
assert.equal(result.pessimisticEstimate.nodeTiming.size, 7);
assert.equal(result.optimisticEstimate.nodeTimings.size, 4);
assert.equal(result.pessimisticEstimate.nodeTimings.size, 7);
assert.ok(result.optimisticGraph, 'should have created optimistic graph');
assert.ok(result.pessimisticGraph, 'should have created pessimistic graph');
});

2
lighthouse-core/test/lib/dependency-graph/simulator/simulator-test.js
Просмотреть файл

@ -40,7 +40,7 @@ describe('DependencyGraph/Simulator', () => {
const serverResponseTimeByOrigin = new Map([['http://example.com', 500]]);
function assertNodeTiming(result, node, assertions) {
const timing = result.nodeTiming.get(node);
const timing = result.nodeTimings.get(node);
assert.ok(timing, 'missing node timing information');
Object.keys(assertions).forEach(key => {
assert.equal(timing[key], assertions[key]);

2
typings/gatherer.d.ts поставляемый
Просмотреть файл

@ -61,7 +61,7 @@ declare global {
export interface Result {
timeInMs: number;
nodeTiming: Map<GraphNode, NodeTiming>;
nodeTimings: Map<GraphNode, NodeTiming>;
}
}
}