summaryrefslogtreecommitdiff
path: root/src/pardes.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-29 17:01:35 -0300
committerGabriel Schneider <[email protected]>2026-10-29 21:13:33 -0300
commit70de5ec5ff3dad01afcc45244ad5e5a481486da6 (patch)
treecd4b723dcc2cfd94c4ba2361c134927b0e2df60b /src/pardes.zig
parent349790339897466f323ff28748916aa48aa344f7 (diff)
downloadpardes-70de5ec5ff3dad01afcc45244ad5e5a481486da6.tar.gz
pardes-70de5ec5ff3dad01afcc45244ad5e5a481486da6.zip
dump: one walker dump of the whole session, by name across builds, for Restore, -l, Handover and the store; dump.zig's hand-written schema gone
A dump is walk.zig's walk of the core with a table of every type it reaches (fields, enum and union names, number widths), read back by name; terminals are ghostty's snapshot (screens, history, kitty images); a failed load frees what it made. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Diffstat (limited to 'src/pardes.zig')
-rw-r--r--src/pardes.zig55
1 files changed, 24 insertions, 31 deletions
diff --git a/src/pardes.zig b/src/pardes.zig
index eb09b1f2..0806cc78 100644
--- a/src/pardes.zig
+++ b/src/pardes.zig
@@ -2035,14 +2035,6 @@ test "image dump restores source bytes renderer choices and exact custom tail" {
pane.tag.own = try p.gpa.dupe(u8, " Keep Del");
try dump.dumpState(p);
- var first_dump = try dump.readZon(gpa, p.dump_out.?, "image-first-dump");
- defer first_dump.deinit();
- const first = first_dump.value;
- try std.testing.expect(first.panes[0].image.?.petscii);
- try std.testing.expectEqual(dump.ImagePalette.terminal, first.panes[0].image.?.palette);
- try std.testing.expect(!first.panes[0].image.?.ascii);
- try std.testing.expectEqualStrings(" Keep Del", first.panes[0].tag_tail.?);
-
const restored = try dump.initFromDump(gpa, .{ .tty_only = true }, p.dump_out.?);
defer restored.deinit();
const restored_pane = restored.panes[0].?;
@@ -2053,18 +2045,11 @@ test "image dump restores source bytes renderer choices and exact custom tail" {
try std.testing.expectEqualStrings(" Keep Del", tagline.curTail(restored_pane));
try std.testing.expectEqualSlices(u8, source, restored_pane.image.?.raw);
+ // And dumped again, its bytes still there.
try dump.dumpState(restored);
- var parsed = try dump.readZon(gpa, restored.dump_out.?, "image-redump");
- defer parsed.deinit();
- const redump = parsed.value;
- const encoded = redump.panes[0].image.?.bytes_b64;
- const decoded = try dump.decodeBytes(gpa, encoded);
- defer gpa.free(decoded);
- try std.testing.expectEqualSlices(u8, source, decoded);
- try std.testing.expect(redump.panes[0].image.?.petscii);
- try std.testing.expectEqual(dump.ImagePalette.terminal, redump.panes[0].image.?.palette);
- try std.testing.expect(!redump.panes[0].image.?.ascii);
- try std.testing.expectEqualStrings(" Keep Del", redump.panes[0].tag_tail.?);
+ const again = try dump.load(gpa, .{ .tty_only = true }, restored.dump_out.?, null);
+ defer again.deinit();
+ try std.testing.expectEqualSlices(u8, source, again.panes[0].?.image.?.raw);
}
test "a Look on a directory does not type ls into an occupied terminal" {
@@ -2366,25 +2351,30 @@ test "owned cwd EOF failure retains the pane and Del retries its close" {
}
test "owned cwd restore either copies the directory or preserves the old core" {
+ // No terminal: ghostty 1.4's snapshot decode leaks when an allocation
+ // inside it fails, and this fails every allocation of a Restore in turn
+ // (what pardes's own load made is freed, src/walk.zig rollback).
var allocator = std.testing.FailingAllocator.init(std.testing.allocator, .{});
- const p = try Pardes.init(allocator.allocator(), .{ .tty_only = true });
+ const p = try Pardes.init(allocator.allocator(), .{ .tty_only = true, .file = "/nonexistent/pardes-owned-cwd" });
defer p.deinit();
- p.setCwd(0, "/retained/terminal/directory");
+ p.newScratchBelow(0);
+ const id = p.active;
+ try p.panes[id].?.setOwnedCwd("/retained/terminal/directory");
try dump.dumpState(p);
- const original = p.panes[0].?;
+ const original = p.panes[id].?;
var completed = false;
for (0..256) |failure| {
allocator.has_induced_failure = false;
allocator.fail_index = allocator.alloc_index + failure;
const replacement = dump.restore(p, p.dump_out.?, "test") catch {
try std.testing.expect(allocator.has_induced_failure);
- try std.testing.expectEqual(original, p.panes[0].?);
+ try std.testing.expectEqual(original, p.panes[id].?);
try std.testing.expectEqualStrings("/retained/terminal/directory", original.cwdSlice());
continue;
};
defer replacement.deinit();
- try std.testing.expectEqualStrings("/retained/terminal/directory", replacement.panes[0].?.cwdSlice());
- try std.testing.expectEqual(original, p.panes[0].?);
+ try std.testing.expectEqualStrings("/retained/terminal/directory", replacement.panes[id].?.cwdSlice());
+ try std.testing.expectEqual(original, p.panes[id].?);
if (!allocator.has_induced_failure) {
completed = true;
break;
@@ -2939,8 +2929,7 @@ test "restored terminals keep monotonic nonzero pane identities" {
const gpa = std.testing.allocator;
const source = try Pardes.init(gpa, .{ .shells = 3 });
defer source.deinit();
- // Filter is a fresh presentation default, not emulator/dump state. Even a
- // pane toggled off in the source session comes back with the default on.
+ // Filter is the pane's, and a dump keeps it: one toggled off comes back off.
source.panes[1].?.tty_filter = false;
try dump.dumpState(source);
@@ -2953,7 +2942,7 @@ test "restored terminals keep monotonic nonzero pane identities" {
for (restored.panes, 0..) |slot, id| {
const pane = slot orelse continue;
if (!pane.isTerminal()) continue;
- try std.testing.expect(pane.tty_filter);
+ try std.testing.expectEqual(id != 1, pane.tty_filter);
try std.testing.expect(pane.serial != 0);
for (serials[0..n]) |seen| try std.testing.expect(pane.serial != seen);
ids[n] = id;
@@ -4739,15 +4728,19 @@ pub const Pardes = struct {
"needs_frame", "present_skipped", "shell_continuous", "native_image_patches",
// Drained by every pump before its digest; a replica's queues
// are its own.
- "effects", "in_q",
+ "effects", "effects_head", "effects_len", "in_q", "in_head", "in_len",
// The views not live: written whenever one goes out, so the
// live one's slot is stale (views.zig).
"parked",
+ // How this process was started, and the last dump it made for
+ // its host to write: a session loaded elsewhere has its own.
+ "opts", "dump_out",
},
.derived = .{ "shell_rows", "diff_output", "locations_cache", "retired_panes", "tty_filter_palette", "body_chrome" },
// The host's handles, the 9P server's fids and log, the store file
- // every window of the user shares (and Recent read from it).
- .authority = .{ "host", "fs", "store", "recent" },
+ // every window of the user shares (and Recent read from it), and
+ // the files of a host with no file system of its own.
+ .authority = .{ "host", "fs", "store", "recent", "fallback" },
.len = .{ .{ "jumps", "njumps" }, .{ "look_src", "n_look_src" }, .{ "leader_keys", "leader_n" }, .{ "col_x", "ncol" }, .{ "col_w", "ncol" }, .{ "session_dir", "session_dir_len" } },
};