refactor(benchpress): normalize phase b into B and e into E

This simplifies the perflog metrics and prevents future errors.
This commit is contained in:
Tobias Bosch
2016-09-15 09:25:45 -07:00
committed by Alex Eagle
parent 838d4bbf6c
commit 32aeb1052d
6 changed files with 28 additions and 28 deletions

View File

@ -158,7 +158,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
let normArgs = {'url': data['url'], 'method': data['requestMethod']};
return normalizeEvent(event, {'name': 'sendRequest', 'args': normArgs});
} else if (this._isEvent(categories, name, ['blink.user_timing'], 'navigationStart')) {
return normalizeEvent(event, {'name': name});
return normalizeEvent(event, {'name': 'navigationStart'});
}
return null; // nothing useful in this event
}
@ -182,23 +182,19 @@ export class ChromeDriverExtension extends WebDriverExtension {
}
}
function normalizeEvent(
chromeEvent: {[key: string]: any}, data: {[key: string]: any}): PerfLogEvent {
var ph = chromeEvent['ph'];
function normalizeEvent(chromeEvent: {[key: string]: any}, data: PerfLogEvent): PerfLogEvent {
var ph = chromeEvent['ph'].toUpperCase();
if (ph === 'S') {
ph = 'b';
ph = 'B';
} else if (ph === 'F') {
ph = 'e';
ph = 'E';
} else if (ph === 'R') {
// mark events from navigation timing
ph = 'I';
} else if (ph === 'i') {
// legacy support
ph = 'I';
}
var result: {[key: string]: any} =
{'pid': chromeEvent['pid'], 'ph': ph, 'cat': 'timeline', 'ts': chromeEvent['ts'] / 1000};
if (chromeEvent['ph'] === 'X') {
if (ph === 'X') {
var dur = chromeEvent['dur'];
if (dur === undefined) {
dur = chromeEvent['tdur'];

View File

@ -97,7 +97,7 @@ export class IOsDriverExtension extends WebDriverExtension {
}
function createEvent(
ph: 'X' | 'B' | 'E' | 'b' | 'e', name: string, time: number, args: any = null) {
ph: 'X' | 'B' | 'E' | 'B' | 'E', name: string, time: number, args: any = null) {
var result: PerfLogEvent = {
'cat': 'timeline',
'name': name,
@ -122,9 +122,9 @@ function createEndEvent(name: string, time: number, args: any = null) {
}
function createMarkStartEvent(name: string, time: number) {
return createEvent('b', name, time);
return createEvent('B', name, time);
}
function createMarkEndEvent(name: string, time: number) {
return createEvent('e', name, time);
return createEvent('E', name, time);
}