neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

fix(terminal): file_stream.init call for pty_out should be in the pty actor

Browse source
This commit is contained in:
CJ van den Berg 2026-03-01 18:13:55 +01:00
parent 97f8d024c6
commit a21b1318ed
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/tui/terminal_view.zig
View file

@ -717,7 +717,7 @@ const pty_windows = struct {
allocator: std.mem.Allocator, allocator: std.mem.Allocator,
vt: *Terminal, vt: *Terminal,
stream: tp.file_stream, stream: ?tp.file_stream = null,
parser: Parser, parser: Parser,
receiver: Receiver, receiver: Receiver,
parent: tp.pid, parent: tp.pid,
@ -725,12 +725,9 @@ const pty_windows = struct {
pub fn spawn(allocator: std.mem.Allocator, vt: *Terminal) !tp.pid { pub fn spawn(allocator: std.mem.Allocator, vt: *Terminal) !tp.pid {
const self = try allocator.create(@This()); const self = try allocator.create(@This());
errdefer allocator.destroy(self); errdefer allocator.destroy(self);
// tp.file_stream.init takes a *anyopaque (Win32 HANDLE)
const stream = try tp.file_stream.init("pty_out", vt.ptyOutputHandle());
self.* = .{ self.* = .{
.allocator = allocator, .allocator = allocator,
.vt = vt, .vt = vt,
.stream = stream,
.parser = .{ .buf = try .initCapacity(allocator, 128) }, .parser = .{ .buf = try .initCapacity(allocator, 128) },
.receiver = Receiver.init(pty_receive, self), .receiver = Receiver.init(pty_receive, self),
.parent = tp.self_pid().clone(), .parent = tp.self_pid().clone(),
@ -740,7 +737,7 @@ const pty_windows = struct {
fn deinit(self: *@This()) void { fn deinit(self: *@This()) void {
std.log.debug("terminal: pty actor (windows) deinit", .{}); std.log.debug("terminal: pty actor (windows) deinit", .{});
self.stream.deinit(); if (self.stream) |s| s.deinit();
self.parser.buf.deinit(); self.parser.buf.deinit();
self.parent.deinit(); self.parent.deinit();
self.allocator.destroy(self); self.allocator.destroy(self);
@ -748,7 +745,11 @@ const pty_windows = struct {
fn start(self: *@This()) tp.result { fn start(self: *@This()) tp.result {
errdefer self.deinit(); errdefer self.deinit();
self.stream.start_read() catch |e| { self.stream = tp.file_stream.init("pty_out", self.vt.ptyOutputHandle()) catch |e| {
std.log.debug("terminal: pty stream init failed: {}", .{e});
return tp.exit_error(e, @errorReturnTrace());
};
self.stream.?.start_read() catch |e| {
std.log.debug("terminal: pty stream start_read failed: {}", .{e}); std.log.debug("terminal: pty stream start_read failed: {}", .{e});
return tp.exit_error(e, @errorReturnTrace()); return tp.exit_error(e, @errorReturnTrace());
}; };
@ -784,7 +785,7 @@ const pty_windows = struct {
.running => {}, .running => {},
} }
// Re-arm the read for next chunk // Re-arm the read for next chunk
self.stream.start_read() catch |e| { self.stream.?.start_read() catch |e| {
std.log.debug("terminal: pty stream re-arm failed: {}", .{e}); std.log.debug("terminal: pty stream re-arm failed: {}", .{e});
return tp.exit_normal(); return tp.exit_normal();
}; };