diff --git a/.github/workflows/player-safari.yml b/.github/workflows/player-safari.yml index 057ea172c6..1037b0953b 100644 --- a/.github/workflows/player-safari.yml +++ b/.github/workflows/player-safari.yml @@ -68,7 +68,7 @@ jobs: working-directory: packages/player run: | sw_vers - CHROMEDRIVER="$CHROMEWEBDRIVER/chromedriver" bun run tests/perf/browsers/run.ts --browsers safari,chrome --runs 2 + CHROMEDRIVER="$CHROMEWEBDRIVER/chromedriver" bun run tests/perf/browsers/run.ts --browsers safari --fixtures heavy-alpha-webm,heavy-alpha-hevc --runs 8 - name: Upload results if: always() diff --git a/packages/player/tests/perf/browsers/bench-page.js b/packages/player/tests/perf/browsers/bench-page.js index 032fb6372b..ebcf2f9d04 100644 --- a/packages/player/tests/perf/browsers/bench-page.js +++ b/packages/player/tests/perf/browsers/bench-page.js @@ -121,6 +121,10 @@ export async function bench(cfg) { const unstarted = videos() .filter((v) => v.readyState === 0 && v.networkState === 2) .map((v) => v.currentSrc.split("/").pop()); + const all = videos().map((v) => + [v.currentSrc.split("/").pop(), v.readyState, v.networkState, v.preload, v.error && v.error.code, v.buffered.length].join(":"), + ); + e.message += ` [probe ${Date.now()} ${all.join(" ")}]`; if (unstarted.length === 0) throw e; throw new Error(`${e.message}: the browser never started loading ${unstarted.join(", ")}`); }); diff --git a/packages/player/tests/perf/browsers/run.ts b/packages/player/tests/perf/browsers/run.ts index a6b026e447..f691ae7d3e 100644 --- a/packages/player/tests/perf/browsers/run.ts +++ b/packages/player/tests/perf/browsers/run.ts @@ -325,6 +325,11 @@ try { } for (const fixture of fixtures) { for (let run = 1; run <= runs; run++) { + const wc = execFileSync("ps", ["-axo", "pid=,etime=,rss=,comm="], { encoding: "utf-8" }) + .split("\n") + .filter((l) => /WebKit\.(WebContent|GPU|Networking)/.test(l)) + .map((l) => l.trim().replace(/\s+\S*\/com\.apple\.WebKit\./, " ")); + console.log(`[probe] ${Date.now()} ${browser} ${fixture} run ${run} start: ${wc.join(" | ")}`); try { const { page, peakRssMb } = await runFilm( `http://127.0.0.1:${port}`, diff --git a/packages/player/tests/perf/server.ts b/packages/player/tests/perf/server.ts index a3d1712deb..a058313162 100644 --- a/packages/player/tests/perf/server.ts +++ b/packages/player/tests/perf/server.ts @@ -190,6 +190,8 @@ export function startServer(options: ServeOptions = {}): RunningServer { if (path.startsWith("/fixtures/")) { const rel = path.replace(/^\/fixtures\//, ""); + if (rel.includes("_media/")) + console.log(`[probe] serve ${Date.now()} ${rel} range=${req.headers.get("range")}`); const filePath = join(PATHS.fixturesDir, rel); if (!filePath.startsWith(PATHS.fixturesDir)) { return new Response("Forbidden", { status: 403 });