Skip to content

Commit 094ecd4

Browse files
committed
Use new headless mode
1 parent b35275a commit 094ecd4

File tree

4 files changed

+11
-23
lines changed

4 files changed

+11
-23
lines changed

webdriver-ts/src/forkedBenchmarkRunnerPlaywright.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,7 @@ async function runMemBenchmark(
190190
await wait(40);
191191
// let result = (await client.send('Performance.getMetrics')).metrics.filter((m) => m.name==='JSHeapUsedSize')[0].value / 1024 / 1024;
192192

193-
let result = 0;
194-
if (benchmarkOptions.headless) {
195-
console.log("performance.measureUserAgentSpecificMemory doesn't work for headless.");
196-
result = (await client.send('Performance.getMetrics')).metrics.filter((m) => m.name==='JSHeapUsedSize')[0].value / 1024 / 1024;
197-
} else {
198-
result = (await page.evaluate("performance.measureUserAgentSpecificMemory()") as any).bytes / 1024 / 1024;
199-
}
193+
let result = (await page.evaluate("performance.measureUserAgentSpecificMemory()") as any).bytes / 1024 / 1024;
200194
console.log("afterBenchmark ");
201195
results.push(result);
202196
console.log(`memory result for ${framework.name} and ${benchmark.benchmarkInfo.id}: ${result}`);

webdriver-ts/src/forkedBenchmarkRunnerPuppeteer.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,7 @@ async function runMemBenchmark(
194194
await runBenchmark(page, benchmark, framework);
195195
await forceGC(page, client);
196196
await wait(40);
197-
let result = 0;
198-
if (benchmarkOptions.headless) {
199-
console.log("performance.measureUserAgentSpecificMemory doesn't work for headless.");
200-
let metrics = await page.metrics();
201-
let result = metrics.JSHeapUsedSize / 1024.0 / 1024.0;
202-
} else {
203-
result = (await page.evaluate("performance.measureUserAgentSpecificMemory()") as any).bytes / 1024 / 1024;
204-
}
205-
197+
let result = (await page.evaluate("performance.measureUserAgentSpecificMemory()") as any).bytes / 1024 / 1024;
206198
console.log("afterBenchmark");
207199

208200
results.push(result);

webdriver-ts/src/playwrightAccess.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,11 @@ function browserPath(benchmarkOptions: BenchmarkDriverOptions) {
9494
}
9595

9696
export async function startBrowser(benchmarkOptions: BenchmarkDriverOptions): Promise<Browser> {
97-
const width = 1280;
98-
const height = 800;
99-
97+
let args = ['--window-size=1000,800', '--js-flags=--expose-gc'];
98+
if (benchmarkOptions.headless) args.push('--headless=chrome');
10099
const browser = await chromium.launch({
101-
args: [`--window-size=${width},${height}`, '--js-flags=--expose-gc' ],
102-
headless: benchmarkOptions.headless,
100+
args,
101+
headless: false,
103102
// executablePath: "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
104103
executablePath: browserPath(benchmarkOptions),
105104
});

webdriver-ts/src/puppeteerAccess.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,11 @@ export async function startBrowser(benchmarkOptions: BenchmarkDriverOptions): Pr
9898
let window_width = width,
9999
window_height = height;
100100

101+
let args = [`--window-size=${window_width},${window_height}`,'--js-flags=--expose-gc' ];
102+
if (benchmarkOptions.headless) args.push('--headless=chrome');
103+
101104
const browser = await puppeteer.launch({
102-
headless: benchmarkOptions.headless,
105+
headless: false,
103106
executablePath: browserPath(benchmarkOptions),
104107
ignoreDefaultArgs: ["--enable-automation", // 92/115
105108
"--disable-background-networking",
@@ -127,7 +130,7 @@ export async function startBrowser(benchmarkOptions: BenchmarkDriverOptions): Pr
127130
// "--enable-blink-features=IdleDetection",
128131
// // "--export-tagged-pdf"
129132
],
130-
args: [`--window-size=${window_width},${window_height}`,'--js-flags=--expose-gc' ],
133+
args,
131134
dumpio: false,
132135
defaultViewport: {
133136
width,

0 commit comments

Comments
 (0)