Skip to content

Commit 8da83d7

Browse files
jackfranklinDevtools-frontend LUCI CQ
authored andcommitted
RPP: rename Timing helper methods
- Renamed `millisecondsToMicroseconds` to `milliToMicro` - Renamed `secondsToMilliseconds` to `secondsToMilli` - Renamed `secondsToMicroseconds` to `secondsToMicro` - Renamed `microSecondsToMilliseconds` to `microToMilli` - Renamed `microSecondsToSeconds` to `microToSeconds` Bug: none Change-Id: I14d6a93d87f181463035ec391fda3076c155a159 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6190947 Auto-Submit: Jack Franklin <[email protected]> Commit-Queue: Adam Raine <[email protected]> Reviewed-by: Adam Raine <[email protected]>
1 parent 06c386f commit 8da83d7

File tree

64 files changed

+242
-272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+242
-272
lines changed

front_end/models/trace/Processor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ export class TraceProcessor extends EventTarget {
503503
if (navigations.length) {
504504
const bounds = Helpers.Timing.traceWindowFromMicroSeconds(parsedTrace.Meta.traceBounds.min, navigations[0].ts);
505505
// When using "Record and reload" option, it typically takes ~5ms. So use 50ms to be safe.
506-
const threshold = Helpers.Timing.millisecondsToMicroseconds(50 as Types.Timing.MilliSeconds);
506+
const threshold = Helpers.Timing.milliToMicro(50 as Types.Timing.MilliSeconds);
507507
if (bounds.range > threshold) {
508508
const context: Insights.Types.InsightSetContext = {
509509
bounds,

front_end/models/trace/extras/MainThreadActivity.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import * as Trace from '../trace.js';
99

1010
const DEVTOOLS_CATEGORY = 'disabled-by-default-devtools.timeline';
1111
function milliToMicro(x: number): Trace.Types.Timing.MicroSeconds {
12-
return Trace.Helpers.Timing.millisecondsToMicroseconds(Trace.Types.Timing.MilliSeconds(x));
12+
return Trace.Helpers.Timing.milliToMicro(Trace.Types.Timing.MilliSeconds(x));
1313
}
1414

1515
function makeFakeBounds(min: number, max: number): Trace.Types.Timing.TraceWindowMicroSeconds {

front_end/models/trace/extras/TraceTree.test.ts

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,30 +137,28 @@ describeWithEnvironment('TraceTree', () => {
137137
assert.strictEqual(rootChildren.size, 2);
138138

139139
const rootChildIterator = rootChildren.values();
140-
assert.strictEqual(
141-
rootChildIterator.next().value!.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventA.dur));
140+
assert.strictEqual(rootChildIterator.next().value!.selfTime, Trace.Helpers.Timing.microToMilli(eventA.dur));
142141

143142
const nodeB = rootChildIterator.next().value as TraceTree.TopDownNode;
144143
const nodeBSelfTime = Trace.Types.Timing.MicroSeconds(eventB.dur - eventC.dur - eventD.dur);
145-
assert.strictEqual(nodeB.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(nodeBSelfTime));
144+
assert.strictEqual(nodeB.selfTime, Trace.Helpers.Timing.microToMilli(nodeBSelfTime));
146145

147146
const nodeBChildren = nodeB.children();
148147
assert.strictEqual(nodeBChildren.size, 2);
149148

150149
const nodeBChildIterator = nodeBChildren.values();
151-
assert.strictEqual(
152-
nodeBChildIterator.next().value!.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventC.dur));
150+
assert.strictEqual(nodeBChildIterator.next().value!.selfTime, Trace.Helpers.Timing.microToMilli(eventC.dur));
153151

154152
const nodeD = nodeBChildIterator.next().value!;
155153
const nodeDSelfTime = Trace.Types.Timing.MicroSeconds(eventD.dur - eventE.dur);
156-
assert.strictEqual(nodeD.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(nodeDSelfTime));
154+
assert.strictEqual(nodeD.selfTime, Trace.Helpers.Timing.microToMilli(nodeDSelfTime));
157155

158156
const nodeDChildren = nodeD.children();
159157
assert.strictEqual(nodeDChildren.size, 1);
160158

161159
const nodeDChildIterator = nodeDChildren.values();
162160
const nodeE = nodeDChildIterator.next().value!;
163-
assert.strictEqual(nodeE.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventE.dur));
161+
assert.strictEqual(nodeE.selfTime, Trace.Helpers.Timing.microToMilli(eventE.dur));
164162
});
165163
});
166164

@@ -323,22 +321,21 @@ describeWithEnvironment('TraceTree', () => {
323321
assert.strictEqual(rootChildren.size, 5);
324322

325323
const rootChildIterator = rootChildren.values();
326-
assert.strictEqual(
327-
rootChildIterator.next().value!.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventA.dur));
324+
assert.strictEqual(rootChildIterator.next().value!.selfTime, Trace.Helpers.Timing.microToMilli(eventA.dur));
328325

329326
const nodeC = rootChildIterator.next().value as TraceTree.TopDownNode;
330-
assert.strictEqual(nodeC.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventC.dur));
327+
assert.strictEqual(nodeC.selfTime, Trace.Helpers.Timing.microToMilli(eventC.dur));
331328

332329
const nodeE = rootChildIterator.next().value as TraceTree.TopDownNode;
333-
assert.strictEqual(nodeE.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(eventE.dur));
330+
assert.strictEqual(nodeE.selfTime, Trace.Helpers.Timing.microToMilli(eventE.dur));
334331

335332
const nodeD = rootChildIterator.next().value as TraceTree.TopDownNode;
336333
const nodeDSelfTime = Trace.Types.Timing.MicroSeconds(eventD.dur - eventE.dur);
337-
assert.strictEqual(nodeD.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(nodeDSelfTime));
334+
assert.strictEqual(nodeD.selfTime, Trace.Helpers.Timing.microToMilli(nodeDSelfTime));
338335

339336
const nodeB = rootChildIterator.next().value as TraceTree.TopDownNode;
340337
const nodeBSelfTime = Trace.Types.Timing.MicroSeconds(eventB.dur - eventC.dur - eventD.dur);
341-
assert.strictEqual(nodeB.selfTime, Trace.Helpers.Timing.microSecondsToMilliseconds(nodeBSelfTime));
338+
assert.strictEqual(nodeB.selfTime, Trace.Helpers.Timing.microToMilli(nodeBSelfTime));
342339
});
343340

344341
it('correctly keeps ProfileCall nodes and uses them to build up the tree', async function() {

front_end/models/trace/extras/TraceTree.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ export class TopDownNode extends Node {
125125
onStartEvent,
126126
onEndEvent,
127127
onInstantEvent: instantEventCallback,
128-
startTime: Helpers.Timing.millisecondsToMicroseconds(startTime),
129-
endTime: Helpers.Timing.millisecondsToMicroseconds(endTime),
128+
startTime: Helpers.Timing.milliToMicro(startTime),
129+
endTime: Helpers.Timing.milliToMicro(endTime),
130130
eventFilter: root.filter,
131131
ignoreAsyncEvents: false,
132132
},
@@ -365,8 +365,8 @@ export class BottomUpRootNode extends Node {
365365
{
366366
onStartEvent,
367367
onEndEvent,
368-
startTime: Helpers.Timing.millisecondsToMicroseconds(this.startTime),
369-
endTime: Helpers.Timing.millisecondsToMicroseconds(this.endTime),
368+
startTime: Helpers.Timing.milliToMicro(this.startTime),
369+
endTime: Helpers.Timing.milliToMicro(this.endTime),
370370
eventFilter: this.filter,
371371
ignoreAsyncEvents: false,
372372
},
@@ -506,8 +506,8 @@ export class BottomUpNode extends Node {
506506
{
507507
onStartEvent,
508508
onEndEvent,
509-
startTime: Helpers.Timing.millisecondsToMicroseconds(startTime),
510-
endTime: Helpers.Timing.millisecondsToMicroseconds(endTime),
509+
startTime: Helpers.Timing.milliToMicro(startTime),
510+
endTime: Helpers.Timing.milliToMicro(endTime),
511511
eventFilter: this.root.filter,
512512
ignoreAsyncEvents: false,
513513
},

front_end/models/trace/handlers/LayoutShiftsHandler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ interface LayoutShifts {
6161

6262
// This represents the maximum #time we will allow a cluster to go before we
6363
// reset it.
64-
export const MAX_CLUSTER_DURATION = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(5000));
64+
export const MAX_CLUSTER_DURATION = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(5000));
6565

6666
// This represents the maximum #time we will allow between layout shift events
6767
// before considering it to be the start of a new cluster.
68-
export const MAX_SHIFT_TIME_DELTA = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(1000));
68+
export const MAX_SHIFT_TIME_DELTA = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(1000));
6969

7070
// Layout shifts are reported globally to the developer, irrespective of which
7171
// frame they originated in. However, each process does have its own individual

front_end/models/trace/handlers/MetaHandler.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ export async function finalize(): Promise<void> {
382382
// navigation happened very soon (0.5 seconds) after the trace started
383383
// recording.
384384
const firstMainFrameNav = mainFrameNavigations.at(0);
385-
const firstNavTimeThreshold = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(0.5));
385+
const firstNavTimeThreshold = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(0.5));
386386
if (firstMainFrameNav) {
387387
const navigationIsWithinThreshold = firstMainFrameNav.ts - traceBounds.min < firstNavTimeThreshold;
388388
if (firstMainFrameNav.args.data?.isOutermostMainFrame && firstMainFrameNav.args.data?.documentLoaderURL &&

front_end/models/trace/handlers/PageLoadMetricsHandler.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ function storePageLoadMetricAgainstNavigationId(
129129
};
130130
storeMetricScore(frameId, navigationId, tti);
131131

132-
const tbtValue =
133-
Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(event.args.args.total_blocking_time_ms));
132+
const tbtValue = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(event.args.args.total_blocking_time_ms));
134133
const tbt = {
135134
event,
136135
metricName: MetricName.TBT,
@@ -265,8 +264,8 @@ function getNavigationForPageLoadEvent(event: Types.Events.PageLoadEvent): Types
265264
*/
266265
export function scoreClassificationForFirstContentfulPaint(fcpScoreInMicroseconds: Types.Timing.MicroSeconds):
267266
ScoreClassification {
268-
const FCP_GOOD_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(1.8));
269-
const FCP_MEDIUM_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(3.0));
267+
const FCP_GOOD_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(1.8));
268+
const FCP_MEDIUM_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(3.0));
270269
let scoreClassification = ScoreClassification.BAD;
271270
if (fcpScoreInMicroseconds <= FCP_MEDIUM_TIMING) {
272271
scoreClassification = ScoreClassification.OK;
@@ -284,8 +283,8 @@ export function scoreClassificationForFirstContentfulPaint(fcpScoreInMicrosecond
284283

285284
export function scoreClassificationForTimeToInteractive(ttiTimeInMicroseconds: Types.Timing.MicroSeconds):
286285
ScoreClassification {
287-
const TTI_GOOD_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(3.8));
288-
const TTI_MEDIUM_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(7.3));
286+
const TTI_GOOD_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(3.8));
287+
const TTI_MEDIUM_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(7.3));
289288
let scoreClassification = ScoreClassification.BAD;
290289
if (ttiTimeInMicroseconds <= TTI_MEDIUM_TIMING) {
291290
scoreClassification = ScoreClassification.OK;
@@ -303,8 +302,8 @@ export function scoreClassificationForTimeToInteractive(ttiTimeInMicroseconds: T
303302

304303
export function scoreClassificationForLargestContentfulPaint(lcpTimeInMicroseconds: Types.Timing.MicroSeconds):
305304
ScoreClassification {
306-
const LCP_GOOD_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(2.5));
307-
const LCP_MEDIUM_TIMING = Helpers.Timing.secondsToMicroseconds(Types.Timing.Seconds(4));
305+
const LCP_GOOD_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(2.5));
306+
const LCP_MEDIUM_TIMING = Helpers.Timing.secondsToMicro(Types.Timing.Seconds(4));
308307
let scoreClassification = ScoreClassification.BAD;
309308
if (lcpTimeInMicroseconds <= LCP_MEDIUM_TIMING) {
310309
scoreClassification = ScoreClassification.OK;
@@ -330,8 +329,8 @@ export function scoreClassificationForDOMContentLoaded(_dclTimeInMicroseconds: T
330329

331330
export function scoreClassificationForTotalBlockingTime(tbtTimeInMicroseconds: Types.Timing.MicroSeconds):
332331
ScoreClassification {
333-
const TBT_GOOD_TIMING = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(200));
334-
const TBT_MEDIUM_TIMING = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(600));
332+
const TBT_GOOD_TIMING = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(200));
333+
const TBT_MEDIUM_TIMING = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(600));
335334
let scoreClassification = ScoreClassification.BAD;
336335
if (tbtTimeInMicroseconds <= TBT_MEDIUM_TIMING) {
337336
scoreClassification = ScoreClassification.OK;

front_end/models/trace/handlers/SamplesHandler.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function buildProfileCalls(): void {
5555
if (threadId === undefined) {
5656
return;
5757
}
58-
const ts = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(timeStampMilliseconds));
58+
const ts = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(timeStampMilliseconds));
5959
const nodeId = node.id as Helpers.TreeHelpers.TraceEntryNodeId;
6060

6161
const profileCall = Helpers.Trace.makeProfileCall(node, profileId, sampleIndex, ts, processId, threadId);
@@ -83,8 +83,8 @@ function buildProfileCalls(): void {
8383
tid === undefined || traceEntryNode === undefined) {
8484
return;
8585
}
86-
const dur = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(durMs));
87-
const selfTime = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(selfTimeMs));
86+
const dur = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(durMs));
87+
const selfTime = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(selfTimeMs));
8888
profileCall.dur = dur;
8989
traceEntryNode.selfTime = selfTime;
9090

front_end/models/trace/handlers/ServerTimingsHandler.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ function createSyntheticServerTiming(
8686
if (timing.start === null) {
8787
continue;
8888
}
89-
const convertedTimestamp =
90-
Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(timing.start)) - offset;
89+
const convertedTimestamp = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(timing.start)) - offset;
9190
const parsedUrl = new URL(request.args.data.url);
9291
const origin = parsedUrl.origin;
9392

@@ -98,7 +97,7 @@ function createSyntheticServerTiming(
9897
pid: Types.Events.ProcessID(0),
9998
tid: Types.Events.ThreadID(0),
10099
ts: Types.Timing.MicroSeconds(convertedTimestamp),
101-
dur: Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(timing.value)),
100+
dur: Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(timing.value)),
102101
cat: 'devtools.server-timing',
103102
args: {data: {desc: timing.description || undefined, origin}},
104103
});

front_end/models/trace/handlers/UserInteractionsHandler.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ const allEvents: Types.Events.EventTimingBeginOrEnd[] = [];
2121
const beginCommitCompositorFrameEvents: Types.Events.BeginCommitCompositorFrame[] = [];
2222
const parseMetaViewportEvents: Types.Events.ParseMetaViewport[] = [];
2323

24-
export const LONG_INTERACTION_THRESHOLD = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(200));
24+
export const LONG_INTERACTION_THRESHOLD = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(200));
2525

2626
const INP_GOOD_TIMING = LONG_INTERACTION_THRESHOLD;
27-
const INP_MEDIUM_TIMING = Helpers.Timing.millisecondsToMicroseconds(Types.Timing.MilliSeconds(500));
27+
const INP_MEDIUM_TIMING = Helpers.Timing.milliToMicro(Types.Timing.MilliSeconds(500));
2828

2929
export interface UserInteractionsData {
3030
/** All the user events we found in the trace */
@@ -291,13 +291,12 @@ export async function finalize(): Promise<void> {
291291
// that is relative to event.ts, and can be used when drawing boxes.
292292
// There is some inaccuracy here as we are converting milliseconds to microseconds, but it is good enough until the backend emits more accurate numbers.
293293
const processingStartRelativeToTraceTime = Types.Timing.MicroSeconds(
294-
Helpers.Timing.millisecondsToMicroseconds(processingStart) -
295-
Helpers.Timing.millisecondsToMicroseconds(timeStamp) + interactionStartEvent.ts,
294+
Helpers.Timing.milliToMicro(processingStart) - Helpers.Timing.milliToMicro(timeStamp) +
295+
interactionStartEvent.ts,
296296
);
297297

298298
const processingEndRelativeToTraceTime = Types.Timing.MicroSeconds(
299-
(Helpers.Timing.millisecondsToMicroseconds(processingEnd) -
300-
Helpers.Timing.millisecondsToMicroseconds(timeStamp)) +
299+
(Helpers.Timing.milliToMicro(processingEnd) - Helpers.Timing.milliToMicro(timeStamp)) +
301300
interactionStartEvent.ts);
302301

303302
// Ultimate frameId fallback only needed for TSC, see comments in the type.

0 commit comments

Comments
 (0)