From f0eba0a5f07b88546cefe530f915302b203d0e6c Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Wed, 4 Nov 2026 23:07:59 -0300 Subject: 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 Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge --- src/gui/gui.zig | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src/gui') diff --git a/src/gui/gui.zig b/src/gui/gui.zig index 3800c794..33922286 100644 --- a/src/gui/gui.zig +++ b/src/gui/gui.zig @@ -3749,24 +3749,7 @@ const Shell = struct { var rec: upgrade.Record = .{ .link = daemon.link, .window = s.gui != null, .exe = path }; for (s.ptys, 0..) |slot, id| if (slot) |pt| if (pt.fd >= 0) rec.addPty(id, pt.pid, pt.fd); var at_buf: [1024:0]u8 = undefined; - const failed: []const u8 = failed: { - const at = pardes.dump.upgradePath(&at_buf, core.settings.dump_dir.get()) orelse break :failed "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; - break :failed 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 s.gpa.free(bytes); - if (!upgrade.writeDump(at, bytes)) break :failed std.fmt.bufPrint(&why, "Upgrade: the session's dump could not be written to {s}; it stays as it is", .{at[0..@min(at.len, 600)]}) catch "Upgrade: its dump could not be written"; - rec.dump = at; - rec.old = upgrade.openSelf(); - daemon.upgraded(); - if (s.fs) |f| f.flushOut(); - const err_words = upgrade.exec(s.gpa, path, -1, &rec); - // Still here: the exec failed. - _ = libc.unlink(at); - if (rec.old >= 0) _ = libc.close(rec.old); - break :failed 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"; - }; + const failed = upgrade.dumpInto(core, &rec, &at_buf, &why) orelse upgrade.execAs(s.gpa, path, &rec, &at_buf, s.fs, &why); // As it was: its ptys read on. for (s.ptys, 0..) |*slot, id| if (slot.*) |*pt| if (pt.fd >= 0 and pt.reader == null) { pt.reader = s.queue.startReader(.{ .handle = pt.fd, .flags = .{ .nonblocking = false } }, @intCast(id), s.gens[id]) catch null; -- cgit v1.3