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

fix(vaxis): use an independant thread for InputReader and leave it running

Browse source 
There is no need to unblock the input reader thread. It can be cleaned
up by the OS and signaling it wrecks our exit code.
This commit is contained in:
CJ van den Berg 2024-05-22 21:21:44 +02:00
parent dc21e7f6ac
commit 5ca9e18ee2
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/tui/tui.zig
View file

@ -51,7 +51,6 @@ init_timer: ?tp.timeout,
sigwinch_signal: ?tp.signal = null, sigwinch_signal: ?tp.signal = null,
no_sleep: bool = false, no_sleep: bool = false,
final_exit: []const u8 = "normal", final_exit: []const u8 = "normal",
input_reader: ?*InputReader = null,
const idle_frames = 1; const idle_frames = 1;
@ -124,7 +123,7 @@ fn init(a: Allocator) !*Self {
if (comptime @hasDecl(renderer, "input_fd")) { if (comptime @hasDecl(renderer, "input_fd")) {
try self.fd_stdin.wait_read(); try self.fd_stdin.wait_read();
} else { } else {
self.input_reader = try InputReader.create(a, self.rdr.input_fd_blocking()); try InputReader.create(a, self.rdr.input_fd_blocking());
} }
self.rdr.handler_ctx = self; self.rdr.handler_ctx = self;
@ -164,7 +163,6 @@ fn deinit(self: *Self) void {
if (comptime @hasDecl(renderer, "input_fd")) if (comptime @hasDecl(renderer, "input_fd"))
self.fd_stdin.deinit(); self.fd_stdin.deinit();
self.logger.deinit(); self.logger.deinit();
if (self.input_reader) |p| p.stop();
self.a.destroy(self); self.a.destroy(self);
} }
@ -820,18 +818,16 @@ const InputReader = struct {
a: std.mem.Allocator, a: std.mem.Allocator,
fd: std.posix.fd_t, fd: std.posix.fd_t,
pid: tp.pid, pid: tp.pid,
id: ?std.Thread.Id = null, thread: std.Thread,
fn create(a: std.mem.Allocator, fd: std.posix.fd_t) error{Exit}!*InputReader { fn create(a: std.mem.Allocator, fd: std.posix.fd_t) error{Exit}!void {
const self = a.create(InputReader) catch |e| return tp.exit_error(e); const self = a.create(InputReader) catch |e| return tp.exit_error(e);
self.* = .{ self.* = .{
.a = a, .a = a,
.fd = fd, .fd = fd,
.pid = tp.self_pid().clone(), .pid = tp.self_pid().clone(),
.thread = std.Thread.spawn(.{}, InputReader.start, .{self}) catch |e| return tp.exit_error(e),
}; };
const pid = tp.spawn_link(self.a, self, InputReader.start, "tui.InputReader") catch |e| return tp.exit_error(e);
pid.deinit();
return self;
} }
fn deinit(self: *InputReader) void { fn deinit(self: *InputReader) void {
@ -839,20 +835,13 @@ const InputReader = struct {
self.a.destroy(self); self.a.destroy(self);
} }
fn start(self: *InputReader) tp.result { fn start(self: *InputReader) void {
defer self.deinit(); defer self.deinit();
self.id = std.Thread.getCurrentId();
var buf: [4096]u8 = undefined; var buf: [4096]u8 = undefined;
while (true) { while (true) {
const n = std.posix.read(self.fd, &buf) catch |e| return tp.exit_error(e); const n = std.posix.read(self.fd, &buf) catch return;
if (n == 0) if (n == 0) return;
return tp.exit_normal(); self.pid.send(.{ "process_input", buf[0..n] }) catch {};
try self.pid.send(.{ "process_input", buf[0..n] });
} }
} }
fn stop(self: *InputReader) void {
if (self.id) |id|
_ = std.os.linux.tkill(@intCast(id), std.os.linux.SIG.INT);
}
}; };