diff options
| author | Gabriel Schneider <[email protected]> | 2026-11-04 19:52:36 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-11-04 20:50:57 -0300 |
| commit | 3b082687c7da1c5d8cc52c71fdf4ddd38d860cd8 (patch) | |
| tree | 2bb1390e99b25598bf361860fede0d3e0a422248 /test/process.zig | |
| parent | f7442cb1f23ce10ccedaa37b1851d751f689943d (diff) | |
| download | pardes-3b082687c7da1c5d8cc52c71fdf4ddd38d860cd8.tar.gz pardes-3b082687c7da1c5d8cc52c71fdf4ddd38d860cd8.zip | |
test: Detached on Child, one spawner for the process runner where three had grown (Detached's own fork and environment, its window pty, Child's): a session, the window's too, is Child.spawn with the root's environment, the window's test variables, its pty and its stderr to a file (Child's new err_log, which nobody's pipe can fill), 78 lines fewer; held connections time out a read after 60 s (SO_RCVTIMEO), so a lost answer fails its case, not the run; terminals' pty/run case tty-only for now, as on the window a fresh terminal's first pty/run sometimes never answers (4 runs of 6, docs/next-tests.md); tty 36 of 36, gui 30 and 6 skipped
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
Diffstat (limited to 'test/process.zig')
| -rw-r--r-- | test/process.zig | 236 |
1 files changed, 82 insertions, 154 deletions
diff --git a/test/process.zig b/test/process.zig index f272fda5..21bc8e31 100644 --- a/test/process.zig +++ b/test/process.zig @@ -49,6 +49,10 @@ pub const Conn = struct { @memset(&addr.path, 0); @memcpy(addr.path[0..path.len], path); if (libc.connect(c.fd, @ptrCast(&addr), @sizeOf(libc.sockaddr.un)) != 0) return error.ConnectFailed; + // An answer that never comes fails the case (error.Hangup) rather + // than holding the run for ever. + const tv: libc.timeval = .{ .sec = 60, .usec = 0 }; + _ = libc.setsockopt(c.fd, libc.SOL.SOCKET, libc.SO.RCVTIMEO, std.mem.asBytes(&tv), @sizeOf(libc.timeval)); _ = try c.call(.{ .version = .{ .msize = msize } }); _ = try c.call(.{ .attach = .{ .fid = 0, .uname = "test" } }); return c; @@ -243,6 +247,8 @@ pub const Conn = struct { if (c.fd < 0) return error.NoSocket; errdefer _ = libc.close(c.fd); if (libc.connect(c.fd, addr, len) != 0) return error.ConnectFailed; + const tv: libc.timeval = .{ .sec = 60, .usec = 0 }; + _ = libc.setsockopt(c.fd, libc.SOL.SOCKET, libc.SO.RCVTIMEO, std.mem.asBytes(&tv), @sizeOf(libc.timeval)); _ = try c.call(.{ .version = .{ .msize = size } }); _ = try c.call(.{ .attach = .{ .fid = 0, .uname = "test" } }); return c; @@ -514,22 +520,18 @@ pub fn only(b: Backend) !void { } pub const Detached = struct { - pid: libc.pid_t, - /// The window's (gui): the pty it runs on, a thread draining it, and - /// the directory its frames and status go to (PARDES_TEST_CAPTURE_DIR, - /// outside the root, whose panes would see a file changing every frame). - master: c_int = -1, - drain: ?std.Thread = null, - cap_buf: [64]u8 = undefined, - cap_len: usize = 0, + child: Child, root_buf: [4096]u8 = undefined, root_len: usize = 0, socket_buf: [4096]u8 = undefined, socket_len: usize = 0, + /// The window's (gui): the directory its frames and status go to + /// (PARDES_TEST_CAPTURE_DIR, outside the root, whose panes would see a + /// file changing every frame). + cap_buf: [64]u8 = undefined, + cap_len: usize = 0, /// Whether deinit removes the root (one passed in is its owner's). owns_root: bool = true, - /// The exit status, once it has exited (`exited`). - status: ?c_int = null, files: Files, pub const Options = struct { @@ -546,8 +548,12 @@ pub const Detached = struct { socket: ?[]const u8 = null, }; + /// A session of the backend's: `pardes --detach=<name>`, or the window + /// (`pardes-gui --9p=<name>`) hidden and offscreen on a pty of its own, + /// in a throwaway root that is its HOME, runtime and config directory + /// (Child's), and back once its socket is linked. pub fn start(gpa: std.mem.Allocator, exe: [:0]const u8, name: []const u8, opts: Options) !Detached { - var d: Detached = .{ .pid = 0, .files = undefined }; + var d: Detached = .{ .child = undefined, .files = undefined }; if (opts.root) |shared| { @memcpy(d.root_buf[0..shared.len], shared); d.root_len = shared.len; @@ -560,112 +566,67 @@ pub const Detached = struct { d.root_len = template.len; } errdefer if (d.owns_root) d.removeRoot(); + const gui = backend == .gui; + if (gui) { + const template = "/tmp/pardes-process-cap-XXXXXX"; + @memcpy(d.cap_buf[0..template.len], template); + d.cap_buf[template.len] = 0; + _ = mkdtemp(d.cap_buf[0..template.len :0]) orelse return error.NoTempDir; + d.cap_len = template.len; + } + errdefer if (d.cap_len > 0) removeDir(d.captures()); const dir = d.root(); - var buf: [4096]u8 = undefined; - const fixture = if (opts.file) |f| try std.fmt.bufPrintSentinel(&buf, "{s}", .{f}, 0) else blk: { - const path = try std.fmt.bufPrintSentinel(&buf, "{s}/{s}.txt", .{ dir, name }, 0); + var bufs: [6][4096]u8 = undefined; + const fixture = if (opts.file) |f| try std.fmt.bufPrintSentinel(&bufs[0], "{s}", .{f}, 0) else blk: { + const path = try std.fmt.bufPrintSentinel(&bufs[0], "{s}/{s}.txt", .{ dir, name }, 0); try eh.writeFile(path, "initial\n"); break :blk path; }; // The session's socket, as its 9P service links it (src/9p_io.zig). const sock_path = try std.fmt.bufPrint(&d.socket_buf, "{s}/9p/pardes/{s}", .{ dir, opts.socket orelse name }); d.socket_len = sock_path.len; - var arg_buf: [256]u8 = undefined; // A window takes no --detach: it is its own session, named by --9p. - const detach = if (backend == .gui) - try std.fmt.bufPrintSentinel(&arg_buf, "--9p={s}", .{opts.socket orelse name}, 0) + const first = if (gui) + try std.fmt.bufPrintSentinel(&bufs[1], "--9p={s}", .{opts.socket orelse name}, 0) else - try std.fmt.bufPrintSentinel(&arg_buf, "--detach={s}", .{name}, 0); - var cap_z: [64]u8 = undefined; - if (backend == .gui) { - const template = "/tmp/pardes-process-cap-XXXXXX"; - @memcpy(cap_z[0..template.len], template); - cap_z[template.len] = 0; - _ = mkdtemp(cap_z[0..template.len :0]) orelse return error.NoTempDir; - @memcpy(d.cap_buf[0..template.len], cap_z[0..template.len]); - d.cap_len = template.len; - } - errdefer if (d.cap_len > 0) removeDir(d.captures()); - var slave: c_int = -1; - if (backend == .gui) { - const ws: std.posix.winsize = .{ .row = 24, .col = 80, .xpixel = 0, .ypixel = 0 }; - if (openpty(&d.master, &slave, null, null, &ws) != 0) return error.NoPty; - } - var env_buf: [3][4096]u8 = undefined; - const root_z = try std.fmt.bufPrintSentinel(&env_buf[0], "{s}", .{dir}, 0); - const config = try std.fmt.bufPrintSentinel(&env_buf[1], "{s}/config", .{dir}, 0); - const dump = try std.fmt.bufPrintSentinel(&env_buf[2], "{s}/{s}.dump.zon", .{ dir, name }, 0); - var err_buf: [4096]u8 = undefined; - const err_log = try std.fmt.bufPrintSentinel(&err_buf, "{s}/{s}.stderr", .{ dir, name }, 0); - // The build hands the binary over by a relative path, and the child - // runs in the root. - var exe_buf: [4096]u8 = undefined; - const exe_abs = realpath(exe, &exe_buf) orelse return error.NoBinary; - var argv: [24:null]?[*:0]const u8 = @splat(null); + try std.fmt.bufPrintSentinel(&bufs[1], "--detach={s}", .{name}, 0); + var argv: [24][:0]const u8 = undefined; if (opts.args.len + 3 > argv.len) return error.TooManyArgs; - argv[0] = exe_abs; - argv[1] = detach; + argv[0] = exe; + argv[1] = first; for (opts.args, 0..) |a, k| argv[2 + k] = a; argv[2 + opts.args.len] = fixture; - const pid = libc.fork(); - if (pid < 0) return error.ForkFailed; - if (pid == 0) { - // What a session of the caller's left in the environment, and a - // pager of theirs, are not the session under test's. - for ([_][*:0]const u8{ "PARDES_PID", "PARDES_9P", "PARDES_PANE", "PARDES_MOUNT", "PAGER" }) |v| _ = unsetenv(v); - for ([_][2][*:0]const u8{ - .{ "HOME", root_z }, .{ "XDG_RUNTIME_DIR", root_z }, .{ "XDG_CONFIG_HOME", config }, - .{ "PARDES_NOTIME", "1" }, .{ "PARDES_DUMP", dump }, .{ "PARDES_LSP_RS", "" }, - .{ "PARDES_LSP_C", "" }, .{ "PARDES_LSP_GO", "" }, .{ "PARDES_LSP_TS", "" }, - .{ "PARDES_LSP_PY", "" }, .{ "PARDES_DAEMON", "off" }, - }) |kv| if (setenv(kv[0], kv[1], 1) != 0) _exit(126); - if (backend == .gui) { - // Hidden and offscreen, its frames and status in its own - // directory: no display of the user's is ever touched. - for ([_][*:0]const u8{ "WAYLAND_DISPLAY", "DISPLAY" }) |v| _ = unsetenv(v); - for ([_][2][*:0]const u8{ - .{ "PARDES_TEST", "1" }, .{ "PARDES_TEST_CAPTURE_DIR", cap_z[0..d.cap_len :0] }, - // A detached session's grid, so a case means the same on both. - .{ "PARDES_TEST_COLS", "160" }, .{ "PARDES_TEST_ROWS", "50" }, - .{ "SDL_VIDEO_DRIVER", "offscreen" }, .{ "TERM", "xterm-256color" }, - }) |kv| if (setenv(kv[0], kv[1], 1) != 0) _exit(126); - // On a terminal of its own, as one started from a shell is. - _ = libc.setsid(); - _ = ioctl(slave, 0x540E, @as(c_int, 0)); // shortcut: Linux's TIOCSCTTY - _ = libc.dup2(slave, 0); - _ = libc.dup2(slave, 1); - _ = libc.close(d.master); - } - for (opts.env) |kv| if (setenv(kv[0], kv[1], 1) != 0) _exit(126); - if (libc.chdir(root_z) != 0) _exit(126); - const fd = libc.open(err_log, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o644)); - if (fd >= 0) _ = libc.dup2(fd, 2); - _ = execvp(exe_abs, &argv); - _exit(127); - } - d.pid = pid; - errdefer d.stop(); - if (backend == .gui) { - _ = libc.close(slave); - // What it writes to its terminal is read and dropped, or a full - // pty would stop it. - d.drain = try std.Thread.spawn(.{}, drainPty, .{d.master}); - } - const deadline = eh.nowMs() + 20_000; - var sock_z: [4096]u8 = undefined; - const socket_z = try std.fmt.bufPrintSentinel(&sock_z, "{s}", .{sock_path}, 0); - while (libc.access(socket_z, 0) != 0) { - if (d.exited(0)) |status| { - var said: [4096]u8 = undefined; - const fd = libc.open(err_log, .{}, @as(libc.mode_t, 0)); - const n = if (fd >= 0) libc.read(fd, &said, said.len) else 0; - if (fd >= 0) _ = libc.close(fd); - std.debug.print("the session exited, status {d}: {s}\n", .{ status, said[0..@intCast(@max(n, 0))] }); - return error.SessionExited; - } - if (eh.nowMs() > deadline) return error.NoSocket; - sleepMs(5); + var env: [16][2][:0]const u8 = undefined; + var n: usize = 0; + env[n] = .{ "PARDES_DUMP", try std.fmt.bufPrintSentinel(&bufs[2], "{s}/{s}.dump.zon", .{ dir, name }, 0) }; + n += 1; + if (gui) for ([_][2][:0]const u8{ + .{ "PARDES_TEST", "1" }, + .{ "PARDES_TEST_CAPTURE_DIR", d.cap_buf[0..d.cap_len :0] }, + // A detached session's grid, so a case means the same on both. + .{ "PARDES_TEST_COLS", "160" }, + .{ "PARDES_TEST_ROWS", "50" }, + // Hidden and offscreen: no display of the user's is touched. + .{ "SDL_VIDEO_DRIVER", "offscreen" }, + }) |kv| { + env[n] = kv; + n += 1; + }; + if (n + opts.env.len > env.len) return error.TooManyEnv; + for (opts.env) |kv| { + env[n] = kv; + n += 1; } + d.child = try Child.spawn(argv[0 .. 3 + opts.args.len], .{ + .root = dir, + .env = env[0..n], + .unset = if (gui) &.{ "WAYLAND_DISPLAY", "DISPLAY" } else &.{}, + // A window runs on a terminal of its own, as one started from a shell. + .pty = if (gui) .{ .log = try std.fmt.bufPrintSentinel(&bufs[3], "{s}/{s}.pty", .{ dir, name }, 0) } else null, + .err_log = try std.fmt.bufPrintSentinel(&bufs[4], "{s}/{s}.stderr", .{ dir, name }, 0), + }); + errdefer d.child.deinit(); + try d.child.waitPath(sock_path, 20_000); d.files = .init(gpa, sock_path); return d; } @@ -688,51 +649,20 @@ pub const Detached = struct { /// The file `rel` under the root, whole. pub fn get(d: *const Detached, gpa: std.mem.Allocator, rel: []const u8) ![]u8 { var buf: [4096]u8 = undefined; - const path = try std.fmt.bufPrintSentinel(&buf, "{s}/{s}", .{ d.root(), rel }, 0); - const fd = libc.open(path, .{}, @as(libc.mode_t, 0)); - if (fd < 0) return error.FileNotFound; - defer _ = libc.close(fd); - var out: std.ArrayList(u8) = .empty; - errdefer out.deinit(gpa); - var chunk: [16 * 1024]u8 = undefined; - while (true) { - const n = libc.read(fd, &chunk, chunk.len); - if (n < 0) return error.ReadFailed; - if (n == 0) break; - try out.appendSlice(gpa, chunk[0..@intCast(n)]); - } - return out.toOwnedSlice(gpa); - } - - pub fn signal(d: *const Detached, sig: c_int) void { - if (d.pid > 0) _ = libc.kill(d.pid, @intCast(sig)); + return readWhole(gpa, try std.fmt.bufPrint(&buf, "{s}/{s}", .{ d.root(), rel })); } /// Its exit status once it has exited, waiting up to `ms`; null while /// it runs. A status is the wait(2) word (WEXITSTATUS is `>> 8`). pub fn exited(d: *Detached, ms: i64) ?c_int { - if (d.status) |s| return s; - if (d.pid <= 0) return null; - const deadline = eh.nowMs() + ms; - while (true) { - var status: c_int = 0; - if (libc.waitpid(d.pid, &status, std.c.W.NOHANG) == d.pid) { - d.status = status; - d.pid = 0; - return status; - } - if (eh.nowMs() >= deadline) return null; - sleepMs(10); - } + return d.child.wait(ms); } /// Ended (SIGTERM, then SIGKILL after 5 s), its root removed if it is /// its own. pub fn deinit(d: *Detached) void { d.files.deinit(); - d.stop(); - if (d.master >= 0) _ = libc.close(d.master); - if (d.drain) |t| t.join(); + d.child.deinit(); if (d.cap_len > 0) removeDir(d.captures()); if (d.owns_root) d.removeRoot(); } @@ -781,16 +711,6 @@ pub const Detached = struct { } else |_| {} } - fn stop(d: *Detached) void { - if (d.pid <= 0) return; - _ = libc.kill(d.pid, libc.SIG.TERM); - if (d.exited(5_000) == null) { - _ = libc.kill(d.pid, libc.SIG.KILL); - _ = d.exited(5_000); - } - d.pid = 0; - } - // fsb: /// Whether `rel` under the root is there (a dangling link is not). @@ -858,6 +778,9 @@ const o_cloexec: c_int = 0o2000000; pub const Child = struct { pid: libc.pid_t, err_fd: c_int, + /// Where its stderr goes instead of `err_fd`'s pipe (`Options.err_log`). + err_path: [4096]u8 = undefined, + err_path_len: usize = 0, status: ?c_int = null, /// A pty's ends, when on one, and the process copying its output to /// `Pty.log`. @@ -885,6 +808,10 @@ pub const Child = struct { stdin: ?[]const u8 = null, /// Started in a 24x80 pty, its stdin and stdout. pty: ?Pty = null, + /// Its stderr to this file, not a pipe: a long session's, which + /// nobody reads while it runs and which must never fill. `said` + /// reads it. + err_log: ?[:0]const u8 = null, }; pub fn spawn(argv: []const [:0]const u8, opts: Options) !Child { @@ -906,6 +833,10 @@ pub const Child = struct { var in_pipe: [2]c_int = .{ -1, -1 }; if (opts.stdin != null and pipe2(&in_pipe, o_cloexec) != 0) return error.NoPipe; var c: Child = .{ .pid = 0, .err_fd = err_pipe[0] }; + if (opts.err_log) |path| { + @memcpy(c.err_path[0..path.len], path); + c.err_path_len = path.len; + } if (opts.pty != null) { var ws: std.posix.winsize = .{ .row = 24, .col = 80, .xpixel = 0, .ypixel = 0 }; if (openpty(&c.master, &c.slave, null, null, &ws) != 0) return error.NoPty; @@ -946,7 +877,8 @@ pub const Child = struct { _ = libc.dup2(if (opts.stdin != null) in_pipe[0] else null_fd, 0); _ = libc.dup2(null_fd, 1); } - _ = libc.dup2(err_pipe[1], 2); + const err_file = if (opts.err_log) |path| libc.open(path, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true }, @as(libc.mode_t, 0o644)) else -1; + _ = libc.dup2(if (err_file >= 0) err_file else err_pipe[1], 2); _ = execvp(args[0].?, &args); _exit(127); } @@ -996,6 +928,7 @@ pub const Child = struct { /// Everything it wrote to stderr, read to its end (its exit, or every /// process holding it gone). pub fn said(c: *Child, gpa: std.mem.Allocator) ![]u8 { + if (c.err_path_len > 0) return readWhole(gpa, c.err_path[0..c.err_path_len]); var out: std.ArrayList(u8) = .empty; var buf: [4096]u8 = undefined; while (true) { @@ -1115,11 +1048,6 @@ pub fn quicIncluded(gpa: std.mem.Allocator, exe: [:0]const u8) !bool { return !has(r.said, "QUIC is not included"); } -fn drainPty(fd: c_int) void { - var buf: [4096]u8 = undefined; - while (libc.read(fd, &buf, buf.len) > 0) {} -} - fn removeDir(path: []const u8) void { var cmd: [4200]u8 = undefined; if (std.fmt.bufPrintSentinel(&cmd, "rm -rf -- '{s}'", .{path}, 0)) |c| { |
