Skip to content

Commit 903c74f

Browse files
committed
fix headless
1 parent 6735792 commit 903c74f

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

webdriver-ts/src/forkedBenchmarkRunnerPlaywright.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,16 @@ async function runMemBenchmark(
204204
await wait(40);
205205
// let result = (await client.send('Performance.getMetrics')).metrics.filter((m) => m.name==='JSHeapUsedSize')[0].value / 1024 / 1024;
206206

207-
let result = (await page.evaluate("performance.measureUserAgentSpecificMemory()") as any).bytes / 1024 / 1024;
207+
let result = 0;
208+
if (benchmarkOptions.headless) {
209+
console.log("performance.measureUserAgentSpecificMemory doesn't work for headless.");
210+
result = (await client.send('Performance.getMetrics')).metrics.filter((m) => m.name==='JSHeapUsedSize')[0].value / 1024 / 1024;
211+
} else {
212+
result = (await page.evaluate("performance.measureUserAgentSpecificMemory()") as any).bytes / 1024 / 1024;
213+
}
208214

209215
await afterBenchmark(browser, page, benchmark, framework);
210216
console.log("afterBenchmark ");
211-
// let result = metrics.metrics.JSHeapUsedSize / 1024.0 / 1024.0;
212217
results.push(result);
213218
console.log(`memory result for ${framework.name} and ${benchmark.benchmarkInfo.id}: ${result}`);
214219
if (result < 0) throw new Error(`memory result ${result} < 0`);

webdriver-ts/src/forkedBenchmarkRunnerPuppeteer.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,19 @@ async function runMemBenchmark(
200200

201201
console.log("runBenchmark");
202202
await runBenchmark(page, benchmark, framework);
203-
await wait(40);
204203
await forceGC(page, client);
205-
let metrics = await page.metrics();
204+
await wait(40);
205+
let result = 0;
206+
if (benchmarkOptions.headless) {
207+
console.log("performance.measureUserAgentSpecificMemory doesn't work for headless.");
208+
let metrics = await page.metrics();
209+
let result = metrics.JSHeapUsedSize / 1024.0 / 1024.0;
210+
} else {
211+
result = (await page.evaluate("performance.measureUserAgentSpecificMemory()") as any).bytes / 1024 / 1024;
212+
}
206213

207214
await afterBenchmark(page, benchmark, framework);
208215
console.log("afterBenchmark");
209-
let result = metrics.JSHeapUsedSize / 1024.0 / 1024.0;
210216

211217
results.push(result);
212218
console.log(`memory result for ${framework.name} and ${benchmark.benchmarkInfo.id}: ${result}`);

0 commit comments

Comments
 (0)