summaryrefslogtreecommitdiff
path: root/src/daemon.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon.zig')
-rw-r--r--src/daemon.zig61
1 files changed, 10 insertions, 51 deletions
diff --git a/src/daemon.zig b/src/daemon.zig
index 785f4afd..d2ae012c 100644
--- a/src/daemon.zig
+++ b/src/daemon.zig
@@ -357,19 +357,10 @@ pub fn adopt() void {
}
/// This session is about to exec another build (upgrade.zig): the daemon
-/// is asked to move too, and every replica told why it is let go.
-/// ponytail: a pong its thread writes at the same moment may split the
-/// words; the client reconnects either way.
+/// is asked to move too. Its replica clients were told why they are let go
+/// (replica.zig `Peers.refuseAll`).
pub fn upgraded() void {
tell("upgrade", &.{});
- var out: [600]u8 = undefined;
- const said = wire.encodeServer(&out, .{ .refused = "the session is upgrading to another build of pardes: connect again with that build" }) catch return;
- for (&replica_fds) |*slot| {
- const fd = slot.load(.acquire);
- if (fd < 0) continue;
- _ = writeAll(fd, said);
- _ = libc.shutdown(fd, 2);
- }
}
/// An upgraded session's link and stub as its old process left them: its
@@ -388,6 +379,8 @@ pub const Note = union(enum) {
/// stub's pipe; for a window session, both -1: open a window.
attach: struct { tty: c_int, stub: c_int },
adopted: struct { pids: [max_fds]libc.pid_t, fds: [max_fds]c_int, n: usize },
+ /// A replica's connection, its hello taken (src/replica.zig `Peers`).
+ replica: c_int,
};
/// Hands every note the daemon sends on to `deliver`, on a thread of its
@@ -416,9 +409,7 @@ fn readNotes(fd: c_int, ctx: *anyopaque, deliver: *const fn (ctx: *anyopaque, no
} });
for (got.fds[@min(got.nfds, 2)..got.nfds]) |f| _ = libc.close(f);
} else if (std.mem.eql(u8, verb, "replica")) {
- if (got.nfds >= 1) {
- if (std.Thread.spawn(.{}, serveReplica, .{got.fds[0]})) |t| t.detach() else |_| _ = libc.close(got.fds[0]);
- }
+ if (got.nfds >= 1) deliver(ctx, .{ .replica = got.fds[0] });
for (got.fds[@min(got.nfds, 1)..got.nfds]) |f| _ = libc.close(f);
} else if (std.mem.eql(u8, verb, "adopted")) {
var note: Note = .{ .adopted = .{ .pids = undefined, .fds = undefined, .n = 0 } };
@@ -450,43 +441,11 @@ fn writeAll(fd: c_int, bytes: []const u8) bool {
return true;
}
-var replica_fds: [max_replicas]std.atomic.Value(c_int) = @splat(.init(-1));
-
-/// A replica the daemon handed over, its hello accepted: welcomed, its pings
-/// answered, until it says bye or hangs up. ponytail: phase 5 proper makes it
-/// a replica (the log, the dump, terminal state); this stub is what times a
-/// round trip through the daemon's handoff and `ssh -L`. A message larger
-/// than its buffer ends it.
-fn serveReplica(fd: c_int) void {
- defer _ = libc.close(fd);
- // Where an upgrade finds it to say why it ends (`upgraded`).
- const slot = for (&replica_fds) |*r| {
- if (r.cmpxchgStrong(-1, fd, .acq_rel, .acquire) == null) break r;
- } else null;
- defer if (slot) |r| r.store(-1, .release);
- log.info("a replica connected to '{s}'", .{name()});
- defer log.info("a replica of '{s}' left", .{name()});
- var out: [wire.hello_max]u8 = undefined;
- const pid: u32 = @intCast(libc.getpid());
- if (!writeAll(fd, wire.encodeServer(&out, .{ .welcome = .{ .pid = pid, .session = name() } }) catch return)) return;
- var buf: [msg_max]u8 = undefined;
- var len: usize = 0;
- while (true) {
- while (wire.framed(buf[0..len]) catch return) |f| {
- switch (wire.decodeClient(f.tag, f.payload) catch return) {
- .ping => |v| if (!writeAll(fd, wire.encodeServer(&out, .{ .pong = v }) catch return)) return,
- .bye, .hello => return,
- .event => {},
- }
- std.mem.copyForwards(u8, &buf, buf[f.total..len]);
- len -= f.total;
- }
- if (len == buf.len) return;
- const n = libc.read(fd, buf[len..].ptr, buf.len - len);
- if (n < 0 and libc.errno(n) == .INTR) continue;
- if (n <= 0) return;
- len += @intCast(n);
- }
+/// A replica refused by a session that takes none (a window's, so far).
+pub fn refuseReplica(fd: c_int, why: []const u8) void {
+ var out: [600]u8 = undefined;
+ if (wire.encodeServer(&out, .{ .refused = why })) |bytes| _ = writeAll(fd, bytes) else |_| {}
+ _ = libc.close(fd);
}
/// A session ended by a signal (TERM, HUP, INT): its shells go with it, as