Skip to content

Commit

Permalink
Merge 0efff73 into 8ec5fb3
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulirish
paulirish committed Oct 31, 2017
2 parents 8ec5fb3 + 0efff73 commit 4d42125
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 48 deletions.
60 changes: 23 additions & 37 deletions lighthouse-core/audits/bootup-time.js
View file
Expand Up @@ -123,13 +123,18 @@ class BootupTime extends Audit {
return;
}

const tasks = {};
const taskGroups = {};
perUrlNode.children.forEach((perTaskPerUrlNode) => {
const taskGroup = WebInspector.TimelineUIUtils.eventStyle(perTaskPerUrlNode.event);
tasks[taskGroup.title] = tasks[taskGroup.title] || 0;
tasks[taskGroup.title] += Number((perTaskPerUrlNode.selfTime || 0).toFixed(1));
const task = WebInspector.TimelineUIUtils.eventStyle(perTaskPerUrlNode.event);
// resolve which taskGroup we're using
const groupName = taskToGroup[task.title] || group.other;
taskGroups[groupName] = taskGroups[groupName] || 0;
taskGroups[groupName] += (perTaskPerUrlNode.selfTime || 0);
});
result.set(url, tasks);
Object.keys(taskGroups).forEach(groupName => {
taskGroups[groupName] = Math.round(taskGroups[groupName] * 10) / 10;
});
result.set(url, taskGroups);
});

return result;
Expand All @@ -141,51 +146,32 @@ class BootupTime extends Audit {
*/
static audit(artifacts) {
const trace = artifacts.traces[BootupTime.DEFAULT_PASS];
const bootupTimings = BootupTime.getExecutionTimingsByURL(trace);
const executionTimings = BootupTime.getExecutionTimingsByURL(trace);

let totalBootupTime = 0;
const extendedInfo = {};

const headings = [
{key: 'url', itemType: 'url', text: 'URL'},
{key: 'scripting', itemType: 'text', text: group.scripting},
{key: 'scriptParseCompile', itemType: 'text', text: group.scriptParseCompile},
];

// Group tasks per url
const groupsPerUrl = Array.from(bootupTimings).map(([url, durations]) => {
extendedInfo[url] = durations;

const groups = [];
Object.keys(durations).forEach(task => {
totalBootupTime += durations[task];
const group = taskToGroup[task];

groups[group] = groups[group] || 0;
groups[group] += durations[task];

if (!headings.find(heading => heading.key === group)) {
headings.push(
{key: group, itemType: 'text', text: group}
);
}
});
// map data in correct format to create a table
const results = Array.from(executionTimings).map(([url, groups]) => {
// Increase the totalBootupTime for all the taskGroups
totalBootupTime += Object.keys(groups).reduce((sum, name) => sum += groups[name], 0);
extendedInfo[url] = groups;

return {
url: url,
groups,
// Only reveal the javascript task costs
// Later we can account for forced layout costs, etc.
scripting: Util.formatMilliseconds(groups[group.scripting] || 0, 1),
scriptParseCompile: Util.formatMilliseconds(groups[group.scriptParseCompile] || 0, 1),
};
});

// map data in correct format to create a table
const results = groupsPerUrl.map(({url, groups}) => {
const res = {};
headings.forEach(heading => {
res[heading.key] = Util.formatMilliseconds(groups[heading.key] || 0, 1);
});

res.url = url;

return res;
});

const tableDetails = BootupTime.makeTableDetails(headings, results);

return {
Expand Down
20 changes: 9 additions & 11 deletions lighthouse-core/test/audits/bootup-time-test.js
View file
Expand Up @@ -21,7 +21,7 @@ const errorTrace = JSON.parse(
);

describe('Performance: bootup-time audit', () => {
it('should compute the correct BootupTime values', (done) => {
it('should compute the correct BootupTime values', () => {
const artifacts = {
traces: {
[BootupTime.DEFAULT_PASS]: acceptableTrace,
Expand All @@ -34,16 +34,14 @@ describe('Performance: bootup-time audit', () => {
assert.equal(Math.round(output.rawValue), 176);

const valueOf = name => output.extendedInfo.value[name];
assert.deepEqual(valueOf('https://www.google-analytics.com/analytics.js'), {'Evaluate Script': 40.1, 'Compile Script': 9.6, 'Recalculate Style': 0.2});
assert.deepEqual(valueOf('https://pwa.rocks/script.js'), {'Evaluate Script': 31.8, 'Layout': 5.5, 'Compile Script': 1.3});
assert.deepEqual(valueOf('https://www.googletagmanager.com/gtm.js?id=GTM-Q5SW'), {'Evaluate Script': 25, 'Compile Script': 5.5, 'Recalculate Style': 1.2});
assert.deepEqual(valueOf('https://www.google-analytics.com/plugins/ua/linkid.js'), {'Evaluate Script': 25.2, 'Compile Script': 1.2});
assert.deepEqual(valueOf('https://www.google-analytics.com/cx/api.js?experiment=jdCfRmudTmy-0USnJ8xPbw'), {'Compile Script': 3, 'Evaluate Script': 1.2});
assert.deepEqual(valueOf('https://www.google-analytics.com/cx/api.js?experiment=qvpc5qIfRC2EMnbn6bbN5A'), {'Compile Script': 2.5, 'Evaluate Script': 1});
assert.deepEqual(valueOf('https://pwa.rocks/'), {'Parse HTML': 14.2, 'Evaluate Script': 6.1, 'Compile Script': 1.2});
assert.deepEqual(valueOf('https://pwa.rocks/0ff789bf.js'), {'Parse HTML': 0});

done();
assert.deepEqual(valueOf('https://www.google-analytics.com/analytics.js'), {'Script Evaluation': 40.1, 'Script Parsing & Compile': 9.6, 'Style & Layout': 0.2});
assert.deepEqual(valueOf('https://pwa.rocks/script.js'), {'Script Evaluation': 31.8, 'Style & Layout': 5.5, 'Script Parsing & Compile': 1.3});
assert.deepEqual(valueOf('https://www.googletagmanager.com/gtm.js?id=GTM-Q5SW'), {'Script Evaluation': 25, 'Script Parsing & Compile': 5.5, 'Style & Layout': 1.2});
assert.deepEqual(valueOf('https://www.google-analytics.com/plugins/ua/linkid.js'), {'Script Evaluation': 25.2, 'Script Parsing & Compile': 1.2});
assert.deepEqual(valueOf('https://www.google-analytics.com/cx/api.js?experiment=jdCfRmudTmy-0USnJ8xPbw'), {'Script Parsing & Compile': 3, 'Script Evaluation': 1.2});
assert.deepEqual(valueOf('https://www.google-analytics.com/cx/api.js?experiment=qvpc5qIfRC2EMnbn6bbN5A'), {'Script Parsing & Compile': 2.5, 'Script Evaluation': 1});
assert.deepEqual(valueOf('https://pwa.rocks/'), {'Parsing DOM': 14.2, 'Script Evaluation': 6.1, 'Script Parsing & Compile': 1.2});
assert.deepEqual(valueOf('https://pwa.rocks/0ff789bf.js'), {'Parsing DOM': 0});
});

it('should get no data when no events are present', () => {
Expand Down

0 comments on commit 4d42125

Please sign in to comment.