Skip to content

Commit 3f979aa

Browse files
committed
fix(engine): budget the whole 1 GB per-frame capture adds, not just the second browser
The render's process tree goes from 1002 to 2001 MB at 1080p: the screenshot browser (479 MB) plus a drawElement browser that is itself about 500 MB larger than a screenshot one. The guard budgeted 500 MB. It now budgets the 1 GB measured, scaled by output pixels.
1 parent d38e7cd commit 3f979aa

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎packages/engine/src/services/frameCapture.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ async function initDrawElementOrTransparentBackground(
11951195
"risk_session_memory",
11961196
riskReasons.join("+"),
11971197
`${plan.size} frames need screenshot capture (${riskReasons.join(", ")}) but too little ` +
1198-
`memory is available for a second browser`,
1198+
`memory is available for per-frame capture`,
11991199
);
12001200
return;
12011201
}

‎packages/engine/src/services/riskFrames.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
RISK_RANGE_HYSTERESIS_FRAMES,
66
planRiskFrames,
77
riskSessionFits,
8-
RISK_SESSION_HEADROOM_BYTES,
9-
RISK_SESSION_RSS_BYTES,
8+
RISK_RENDER_HEADROOM_BYTES,
9+
RISK_RENDER_ADDED_BYTES,
1010
withFramesAfterCallback,
1111
scanCssEffectLiveFrames,
1212
} from "./riskFrames.js";
@@ -147,17 +147,17 @@ describe("riskSessionFits", () => {
147147
const mb = (bytes: number) => Math.ceil(bytes / 1024 / 1024);
148148
const HD = 1920 * 1080;
149149

150-
it("needs the screenshot browser plus the headroom", () => {
151-
const need = mb(RISK_SESSION_RSS_BYTES + RISK_SESSION_HEADROOM_BYTES);
150+
it("needs what the render adds plus the headroom", () => {
151+
const need = mb(RISK_RENDER_ADDED_BYTES + RISK_RENDER_HEADROOM_BYTES);
152152
expect(riskSessionFits(need, HD)).toBe(true);
153153
expect(riskSessionFits(need - 10, HD)).toBe(false);
154154
});
155155

156-
it("asks for more at 4K, where the browser holds four times the pixels", () => {
157-
const need = mb(RISK_SESSION_RSS_BYTES + RISK_SESSION_HEADROOM_BYTES);
156+
it("asks for four times as much at 4K, which holds four times the pixels", () => {
157+
const need = mb(RISK_RENDER_ADDED_BYTES + RISK_RENDER_HEADROOM_BYTES);
158158
expect(riskSessionFits(need, HD * 4)).toBe(false);
159159
expect(
160-
riskSessionFits(mb(4 * RISK_SESSION_RSS_BYTES + RISK_SESSION_HEADROOM_BYTES), HD * 4),
160+
riskSessionFits(mb(4 * RISK_RENDER_ADDED_BYTES + RISK_RENDER_HEADROOM_BYTES), HD * 4),
161161
).toBe(true);
162162
});
163163
});

‎packages/engine/src/services/riskFrames.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ const SCAN_CHUNK_FRAMES = 240;
1515
*/
1616
export const MAX_RISK_FRAME_FRACTION = 0.6;
1717

18-
/** Peak size of the screenshot browser on a 1080p render (479 MB measured on a 210 s fixture). */
19-
export const RISK_SESSION_RSS_BYTES = 500_000_000;
18+
/** Peak memory per-frame capture adds over a screenshot render at 1080p: 1002 to 2001 MB measured. */
19+
export const RISK_RENDER_ADDED_BYTES = 1_000_000_000;
2020

2121
/** Memory that must still be available once the screenshot browser is open. */
22-
export const RISK_SESSION_HEADROOM_BYTES = 1_500_000_000;
22+
export const RISK_RENDER_HEADROOM_BYTES = 1_500_000_000;
2323

2424
const PIXELS_1080P = 1920 * 1080;
2525

@@ -116,8 +116,8 @@ export function withFramesAfterCallback(
116116
return live;
117117
}
118118

119-
/** Whether the screenshot browser fits: its size, scaled by output pixels, leaves the headroom. */
119+
/** Whether the render fits: what it adds, scaled by output pixels, leaves the headroom. */
120120
export function riskSessionFits(availableMb: number, outputPixels: number): boolean {
121-
const rss = RISK_SESSION_RSS_BYTES * Math.max(1, outputPixels / PIXELS_1080P);
122-
return availableMb * 1024 * 1024 - rss >= RISK_SESSION_HEADROOM_BYTES;
121+
const rss = RISK_RENDER_ADDED_BYTES * Math.max(1, outputPixels / PIXELS_1080P);
122+
return availableMb * 1024 * 1024 - rss >= RISK_RENDER_HEADROOM_BYTES;
123123
}

0 commit comments

Comments
 (0)