summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/perf-baseline-gui-debug.json2
-rw-r--r--test/perf-baseline-tty-debug.json2
-rw-r--r--test/perf-baseline-tty-fast.json2
-rw-r--r--test/perf.zig50
4 files changed, 53 insertions, 3 deletions
diff --git a/test/perf-baseline-gui-debug.json b/test/perf-baseline-gui-debug.json
index 2dc59271..4f97a834 100644
--- a/test/perf-baseline-gui-debug.json
+++ b/test/perf-baseline-gui-debug.json
@@ -1 +1 @@
-{"harness":"d6116db986ef4a1a","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":2504,"med_us":2757,"p90_us":3062,"max_us":3404},{"op":"render","fixture":"medium","min_us":104,"med_us":108,"p90_us":110,"max_us":113},{"op":"key-down","fixture":"medium","min_us":108,"med_us":113,"p90_us":114,"max_us":118},{"op":"key-right","fixture":"medium","min_us":110,"med_us":115,"p90_us":118,"max_us":126},{"op":"page-down","fixture":"medium","min_us":108,"med_us":113,"p90_us":115,"max_us":115},{"op":"wheel","fixture":"medium","min_us":108,"med_us":110,"p90_us":112,"max_us":114},{"op":"edit-char","fixture":"medium","min_us":1173,"med_us":1386,"p90_us":1467,"max_us":1657},{"op":"edit-twin","fixture":"medium","min_us":1375,"med_us":1661,"p90_us":1975,"max_us":2253},{"op":"body-2m","fixture":"medium","min_us":5550,"med_us":16786,"p90_us":23151,"max_us":25310},{"op":"body-appends","fixture":"medium","min_us":187029,"med_us":298454,"p90_us":342050,"max_us":391769},{"op":"deep-sel","fixture":"medium","min_us":96,"med_us":99,"p90_us":103,"max_us":103}]}
+{"harness":"8ecb4caed482b2","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"gui","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":2065,"med_us":2303,"p90_us":2587,"max_us":3268},{"op":"render","fixture":"medium","min_us":90,"med_us":93,"p90_us":96,"max_us":99},{"op":"key-down","fixture":"medium","min_us":99,"med_us":104,"p90_us":114,"max_us":115},{"op":"key-right","fixture":"medium","min_us":100,"med_us":102,"p90_us":104,"max_us":108},{"op":"page-down","fixture":"medium","min_us":98,"med_us":100,"p90_us":114,"max_us":115},{"op":"wheel","fixture":"medium","min_us":95,"med_us":99,"p90_us":105,"max_us":106},{"op":"edit-char","fixture":"medium","min_us":1084,"med_us":1287,"p90_us":1461,"max_us":1655},{"op":"edit-twin","fixture":"medium","min_us":913,"med_us":1303,"p90_us":1531,"max_us":1687},{"op":"body-2m","fixture":"medium","min_us":5120,"med_us":10396,"p90_us":12244,"max_us":13939},{"op":"body-appends","fixture":"medium","min_us":149170,"med_us":235049,"p90_us":263142,"max_us":275060},{"op":"deep-sel","fixture":"medium","min_us":81,"med_us":83,"p90_us":95,"max_us":103}]}
diff --git a/test/perf-baseline-tty-debug.json b/test/perf-baseline-tty-debug.json
index 0bf5f1f4..adc1f23c 100644
--- a/test/perf-baseline-tty-debug.json
+++ b/test/perf-baseline-tty-debug.json
@@ -1 +1 @@
-{"harness":"d6116db986ef4a1a","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":2430,"med_us":3076,"p90_us":3956,"max_us":4163},{"op":"render","fixture":"medium","min_us":97,"med_us":101,"p90_us":105,"max_us":108},{"op":"key-down","fixture":"medium","min_us":102,"med_us":106,"p90_us":118,"max_us":166},{"op":"key-right","fixture":"medium","min_us":104,"med_us":113,"p90_us":131,"max_us":152},{"op":"page-down","fixture":"medium","min_us":102,"med_us":109,"p90_us":123,"max_us":126},{"op":"wheel","fixture":"medium","min_us":106,"med_us":117,"p90_us":130,"max_us":134},{"op":"edit-char","fixture":"medium","min_us":1510,"med_us":1853,"p90_us":2154,"max_us":2265},{"op":"edit-twin","fixture":"medium","min_us":1701,"med_us":1950,"p90_us":2109,"max_us":2174},{"op":"body-2m","fixture":"medium","min_us":8200,"med_us":15726,"p90_us":19024,"max_us":19240},{"op":"body-appends","fixture":"medium","min_us":236289,"med_us":349768,"p90_us":375918,"max_us":433356},{"op":"deep-sel","fixture":"medium","min_us":93,"med_us":97,"p90_us":103,"max_us":105}]}
+{"harness":"8ecb4caed482b2","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"debug","c_optimize":"fast","terminal_optimize":"safe","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":2131,"med_us":2550,"p90_us":2652,"max_us":2657},{"op":"render","fixture":"medium","min_us":91,"med_us":95,"p90_us":95,"max_us":98},{"op":"key-down","fixture":"medium","min_us":100,"med_us":101,"p90_us":110,"max_us":114},{"op":"key-right","fixture":"medium","min_us":99,"med_us":103,"p90_us":110,"max_us":116},{"op":"page-down","fixture":"medium","min_us":99,"med_us":102,"p90_us":113,"max_us":114},{"op":"wheel","fixture":"medium","min_us":98,"med_us":100,"p90_us":101,"max_us":115},{"op":"edit-char","fixture":"medium","min_us":1029,"med_us":1242,"p90_us":1379,"max_us":1474},{"op":"edit-twin","fixture":"medium","min_us":1020,"med_us":1348,"p90_us":1453,"max_us":1493},{"op":"body-2m","fixture":"medium","min_us":5544,"med_us":8619,"p90_us":10736,"max_us":12537},{"op":"body-appends","fixture":"medium","min_us":128223,"med_us":186404,"p90_us":230106,"max_us":267921},{"op":"deep-sel","fixture":"medium","min_us":80,"med_us":83,"p90_us":87,"max_us":87}]}
diff --git a/test/perf-baseline-tty-fast.json b/test/perf-baseline-tty-fast.json
index 56fabf49..add1b6af 100644
--- a/test/perf-baseline-tty-fast.json
+++ b/test/perf-baseline-tty-fast.json
@@ -1 +1 @@
-{"harness":"d6116db986ef4a1a","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"fast","c_optimize":"fast","terminal_optimize":"fast","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":3074,"med_us":3770,"p90_us":4007,"max_us":4072},{"op":"render","fixture":"medium","min_us":107,"med_us":112,"p90_us":116,"max_us":139},{"op":"key-down","fixture":"medium","min_us":110,"med_us":115,"p90_us":116,"max_us":118},{"op":"key-right","fixture":"medium","min_us":109,"med_us":113,"p90_us":123,"max_us":163},{"op":"page-down","fixture":"medium","min_us":109,"med_us":114,"p90_us":120,"max_us":121},{"op":"wheel","fixture":"medium","min_us":106,"med_us":110,"p90_us":116,"max_us":124},{"op":"edit-char","fixture":"medium","min_us":1352,"med_us":1765,"p90_us":2028,"max_us":2619},{"op":"edit-twin","fixture":"medium","min_us":1391,"med_us":1768,"p90_us":2012,"max_us":2036},{"op":"body-2m","fixture":"medium","min_us":7418,"med_us":15483,"p90_us":18068,"max_us":21188},{"op":"body-appends","fixture":"medium","min_us":217023,"med_us":337159,"p90_us":411334,"max_us":413681},{"op":"deep-sel","fixture":"medium","min_us":92,"med_us":94,"p90_us":100,"max_us":107}]}
+{"harness":"8ecb4caed482b2","build":{"compiler":"0.17.0","target":"x86_64-linux.5.10...7.2-gnu.2.38","cpu":"x86_64","driver_optimize":"fast","core_optimize":"fast","c_optimize":"fast","terminal_optimize":"fast","platform":"tty","grammars":"full","mupdf":true,"jpx":true,"tracy":false,"quic":false,"theme_animation":true,"terminal_simd":true,"prebuilt_shaders":false},"cols":120,"rows":40,"reps":10,"only":"medium","fixtures":[{"name":"small","lines":1000,"cols":60,"bytes":62694},{"name":"medium","lines":50000,"cols":60,"bytes":3201944},{"name":"large","lines":300000,"cols":60,"bytes":19464444},{"name":"longline","lines":400,"cols":8000,"bytes":3200400},{"name":"esp32p4","lines":12,"cols":240,"bytes":2892}],"cells":[{"op":"open","fixture":"medium","min_us":2096,"med_us":2329,"p90_us":2589,"max_us":2704},{"op":"render","fixture":"medium","min_us":77,"med_us":80,"p90_us":85,"max_us":86},{"op":"key-down","fixture":"medium","min_us":84,"med_us":87,"p90_us":101,"max_us":116},{"op":"key-right","fixture":"medium","min_us":84,"med_us":87,"p90_us":93,"max_us":111},{"op":"page-down","fixture":"medium","min_us":85,"med_us":86,"p90_us":89,"max_us":102},{"op":"wheel","fixture":"medium","min_us":83,"med_us":87,"p90_us":98,"max_us":107},{"op":"edit-char","fixture":"medium","min_us":886,"med_us":1127,"p90_us":1466,"max_us":1503},{"op":"edit-twin","fixture":"medium","min_us":928,"med_us":1282,"p90_us":1489,"max_us":1586},{"op":"body-2m","fixture":"medium","min_us":5327,"med_us":8382,"p90_us":10779,"max_us":11879},{"op":"body-appends","fixture":"medium","min_us":140582,"med_us":203008,"p90_us":242154,"max_us":252106},{"op":"deep-sel","fixture":"medium","min_us":71,"med_us":74,"p90_us":75,"max_us":77}]}
diff --git a/test/perf.zig b/test/perf.zig
index 4793da78..31a48cc7 100644
--- a/test/perf.zig
+++ b/test/perf.zig
@@ -1138,10 +1138,56 @@ fn liveSetup(io: std.Io) !Live {
}
fn liveCleanup(io: std.Io, l: *Live) void {
+ liveSweep(io);
std.Io.Dir.cwd().deleteTree(io, l.dir) catch {};
if (std.c.getenv("XDG_RUNTIME_DIR")) |run| std.Io.Dir.cwd().deleteTree(io, std.mem.span(run)) catch {};
}
+/// Every process a live run started that is still there, ended: a tty stub
+/// killed since phase 3 detaches its session rather than ending it, and an
+/// exe that is a wrapper may start sessions of its own (`--detach`). Each
+/// inherited the run's private runtime directory, which no other process
+/// has: TERM, then KILL what is left. After every cell, and in the cleanup
+/// every path takes.
+fn liveSweep(io: std.Io) void {
+ const run = std.mem.span(std.c.getenv("XDG_RUNTIME_DIR") orelse return);
+ var want_buf: [512]u8 = undefined;
+ const want = std.fmt.bufPrint(&want_buf, "XDG_RUNTIME_DIR={s}", .{run}) catch return;
+ const env = gpa.alloc(u8, 1 << 20) catch return;
+ defer gpa.free(env);
+ const self = libc.getpid();
+ for ([_]@TypeOf(libc.SIG.TERM){ .TERM, .KILL }) |sig| {
+ var left: usize = 0;
+ var proc = std.Io.Dir.cwd().openDir(io, "/proc", .{ .iterate = true }) catch return;
+ defer proc.close(io);
+ var it = proc.iterate();
+ while (it.next(io) catch null) |entry| {
+ const pid = std.fmt.parseInt(libc.pid_t, entry.name, 10) catch continue;
+ if (pid == self) continue;
+ var path_buf: [64]u8 = undefined;
+ const path = std.fmt.bufPrintSentinel(&path_buf, "/proc/{d}/environ", .{pid}, 0) catch continue;
+ const fd = libc.open(path, .{ .ACCMODE = .RDONLY });
+ if (fd < 0) continue;
+ var n: usize = 0;
+ while (n < env.len) {
+ const got = libc.read(fd, env.ptr + n, env.len - n);
+ if (got <= 0) break;
+ n += @intCast(got);
+ }
+ _ = libc.close(fd);
+ var vars = std.mem.splitScalar(u8, env[0..n], 0);
+ while (vars.next()) |v| if (std.mem.eql(u8, v, want)) {
+ _ = libc.kill(pid, sig);
+ left += 1;
+ break;
+ };
+ }
+ if (left == 0) return;
+ // A session ends on TERM (it detaches nothing then): a moment for it.
+ if (sig == .TERM) io.sleep(.fromMilliseconds(300), .awake) catch {};
+ }
+}
+
/// The bytes a terminal sends for a step of FrameStats.keys.
fn stepBytes(buf: *[32]u8, step: pardes.FrameStats.Step) []const u8 {
return switch (step.act) {
@@ -1331,11 +1377,15 @@ fn measureLive(io: std.Io, exe: []const u8, gui: bool, reps: usize, json: bool)
for (0..reps) |_| {
if (gui) {
try liveKeysGui(&l, exe_z);
+ liveSweep(io);
continue;
}
try liveKeysTty(&l, exe_z);
+ liveSweep(io);
try liveYes(&l, exe_z);
+ liveSweep(io);
try liveOpen(&l, exe_z);
+ liveSweep(io);
}
const frontend = if (gui) "gui" else "tty";
const out = std.Io.File.stdout();