Skip to content

Commit 17c3be9

Browse files
committed
ref(profiing) fix battery usage chart value
1 parent 7f57483 commit 17c3be9

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

static/app/utils/profiling/uiFrames.tsx

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,23 @@ import {
88
export type UIFrameNode = {
99
duration: number;
1010
end: number;
11-
node: Profiling.MeasurementValue;
11+
node: UIFrameMeasurement;
1212
start: number;
1313
type: 'slow' | 'frozen';
1414
};
1515

16-
type FrameRenders = NonNullable<Profiling.Schema['measurements']>;
16+
type UIFrameMeasurements = {
17+
unit: string;
18+
values: UIFrameMeasurement[];
19+
};
20+
21+
type UIFrameMeasurement = {
22+
elapsed: number;
23+
value: number;
24+
};
1725

18-
function sortFramesByStartedTime(
19-
a: Profiling.MeasurementValue,
20-
b: Profiling.MeasurementValue
21-
) {
22-
return a.elapsed_since_start_ns - a.value - (b.elapsed_since_start_ns - b.value);
26+
function sortFramesByStartedTime(a: UIFrameMeasurement, b: UIFrameMeasurement) {
27+
return a.elapsed - a.value - (b.elapsed - b.value);
2328
}
2429

2530
class UIFrames {
@@ -33,8 +38,8 @@ class UIFrames {
3338

3439
constructor(
3540
frames: {
36-
frozen: FrameRenders['frozen_frame_renders'];
37-
slow: FrameRenders['slow_frame_renders'];
41+
frozen: UIFrameMeasurements | undefined;
42+
slow: UIFrameMeasurements | undefined;
3843
},
3944
options: {unit: string},
4045
configSpace?: Rect
@@ -65,8 +70,8 @@ class UIFrames {
6570
}
6671

6772
buildFramesIntervalTree(
68-
slowFrames: NonNullable<FrameRenders['slow_frame_renders']>,
69-
frozenFrames: NonNullable<FrameRenders['frozen_frame_renders']>
73+
slowFrames: NonNullable<UIFrameMeasurements>,
74+
frozenFrames: NonNullable<UIFrameMeasurements>
7075
): ReadonlyArray<UIFrameNode> {
7176
const frames: UIFrameNode[] = [];
7277

@@ -81,8 +86,8 @@ class UIFrames {
8186
? 'frozen'
8287
: !frozenFramesQueue.length
8388
? 'slow'
84-
: slowFramesQueue[0].elapsed_since_start_ns - slowFramesQueue[0].value <
85-
frozenFramesQueue[0].elapsed_since_start_ns - frozenFramesQueue[0].value
89+
: slowFramesQueue[0].elapsed - slowFramesQueue[0].value <
90+
frozenFramesQueue[0].elapsed - frozenFramesQueue[0].value
8691
? 'slow'
8792
: 'frozen';
8893

@@ -93,8 +98,8 @@ class UIFrames {
9398
const unitFn = nextType === 'slow' ? toSlowFinalUnit : toFrozenFinalUnit;
9499

95100
frames.push({
96-
start: unitFn(frame.elapsed_since_start_ns - frame.value),
97-
end: unitFn(frame.elapsed_since_start_ns),
101+
start: unitFn(frame.elapsed - frame.value),
102+
end: unitFn(frame.elapsed),
98103
duration: unitFn(frame.value),
99104
node: frame,
100105
type: nextType,

0 commit comments

Comments
 (0)