diff options
| author | Gabriel Schneider <[email protected]> | 2026-11-04 23:07:59 -0300 |
|---|---|---|
| committer | Gabriel Schneider <[email protected]> | 2026-11-05 09:54:56 -0300 |
| commit | f0eba0a5f07b88546cefe530f915302b203d0e6c (patch) | |
| tree | 6547a202ad8af2cf3f553fb03402708f49d7f172 /src/upgrade.zig | |
| parent | 236c9f51134adf04932f7653ed0262a0c9253708 (diff) | |
| download | pardes-f0eba0a5f07b88546cefe530f915302b203d0e6c.tar.gz pardes-f0eba0a5f07b88546cefe530f915302b203d0e6c.zip | |
upgrade: an Upgrade's dump and exec are upgrade.dumpInto and upgrade.execAs, which the terminal's and the window's upgradeNow each spelled out (the dump's path, the dump, its write, the old binary held, the daemon told, 9P flushed, the exec and what a failed one undoes); the dump is freed with the core's allocator, which made it, where each frontend freed it with its own after a failed exec (a panic there, never reached); writeDump and openSelf are upgrade.zig's own now
Co-Authored-By: Claude Opus 5.5 <[email protected]>
Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge
Diffstat (limited to 'src/upgrade.zig')
| -rw-r--r-- | src/upgrade.zig | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/src/upgrade.zig b/src/upgrade.zig index 37c79991..2e5f683f 100644 --- a/src/upgrade.zig +++ b/src/upgrade.zig @@ -292,7 +292,7 @@ pub fn check(path: [:0]const u8, buf: []u8) Checked { /// The binary this process runs, open, for a new one to fall back to: on /// Linux the file even once deleted. ponytail: FreeBSD has no /proc by /// default, so a new build there that cannot load a dump starts afresh. -pub fn openSelf() c_int { +fn openSelf() c_int { if (comptime builtin.os.tag != .linux) return -1; return libc.open("/proc/self/exe", .{ .ACCMODE = .RDONLY, .CLOEXEC = true }, @as(libc.mode_t, 0)); } @@ -335,7 +335,7 @@ pub fn exec(gpa: std.mem.Allocator, path: ?[:0]const u8, old: c_int, rec: *const /// The dump of a session to `path` (0600, replaced): false when it could /// not be written whole. -pub fn writeDump(path: [:0]const u8, bytes: []const u8) bool { +fn writeDump(path: [:0]const u8, bytes: []const u8) bool { const fd = libc.open(path, .{ .ACCMODE = .WRONLY, .CREAT = true, .TRUNC = true, .CLOEXEC = true }, @as(libc.mode_t, 0o600)); if (fd < 0) return false; defer _ = libc.close(fd); @@ -352,6 +352,37 @@ pub fn writeDump(path: [:0]const u8, bytes: []const u8) bool { return true; } +/// An Upgrade's dump, the terminal's and the window's alike: written +/// where a Restore finds it (dump.upgradePath, into `at`) and named in +/// `rec`, the binary it replaces held open for a new build that cannot +/// load it. Null when it is, else why in words (`why`'s). +pub fn dumpInto(core: *pardes.Pardes, rec: *Record, at: *[1024:0]u8, why: []u8) ?[]const u8 { + const path = pardes.dump.upgradePath(at, core.settings.dump_dir.get()) orelse return "Upgrade: no directory for the session's dump; this session stays as it is"; + const bytes = pardes.dump.dumpBytes(core) catch |err| { + var words: [128]u8 = undefined; + return std.fmt.bufPrint(why, "Upgrade: the session would not dump: {s}; it stays as it is", .{pardes.Messages.errorWords(err, &words)}) catch "Upgrade: the session would not dump"; + }; + defer core.gpa.free(bytes); + if (!writeDump(path, bytes)) return std.fmt.bufPrint(why, "Upgrade: the session's dump could not be written to {s}; it stays as it is", .{path[0..@min(path.len, 600)]}) catch "Upgrade: its dump could not be written"; + rec.dump = path; + rec.old = openSelf(); + return null; +} + +/// The daemon told, 9P's last answers sent (`fs`), and this process +/// exec'd as `path` with `rec`, whose dump `dumpInto` wrote at `at`. +/// Returns only when the exec failed, that dump removed and the binary it +/// replaces let go: why, in words (`why`'s). +pub fn execAs(gpa: std.mem.Allocator, path: [:0]const u8, rec: *const Record, at: [*:0]const u8, fs: ?*@import("9p_io.zig").Listener, why: []u8) []const u8 { + @import("daemon.zig").upgraded(); + if (fs) |f| f.flushOut(); + const err_words = exec(gpa, path, -1, rec); + // Still here: the exec failed. + _ = libc.unlink(at); + if (rec.old >= 0) _ = libc.close(rec.old); + return std.fmt.bufPrint(why, "Upgrade: {s} would not start: {s}; this session stays as it is", .{ path[0..@min(path.len, 600)], err_words }) catch "Upgrade: the new pardes would not start"; +} + // ---- after: the new process ---- /// The core an upgraded process starts with: the session its dump is. A |
