lobo/stt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "add mutex locks around modifications to child process array"
All checks were successful
Generic zig build / build (push) Successful in 44s
Details

Browse source 
This reverts commit 885283e486.
This commit is contained in:
Emil Lerch 2025-10-25 22:49:30 -07:00
parent 885283e486
commit 14651732e4
Signed by: lobo
GPG key ID: A7B62D657EF764F8
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main.zig
View file

@ -19,7 +19,6 @@ const SpeechHandler = struct {
recoverable_error_count: u32 = 0, recoverable_error_count: u32 = 0,
exec_program: ?[]const u8 = null, exec_program: ?[]const u8 = null,
child_processes: std.ArrayList(*Process) = .{}, child_processes: std.ArrayList(*Process) = .{},
child_processes_mutex: std.Thread.Mutex = .{},
reclaiming: std.atomic.Value(bool) = std.atomic.Value(bool).init(false), reclaiming: std.atomic.Value(bool) = std.atomic.Value(bool).init(false),
const max_children = 5; const max_children = 5;
@ -53,10 +52,6 @@ const SpeechHandler = struct {
} }
fn exec(self: *SpeechHandler, text: []const u8) !void { fn exec(self: *SpeechHandler, text: []const u8) !void {
const program = self.exec_program.?; // should only be called when exec_program is not null const program = self.exec_program.?; // should only be called when exec_program is not null
self.child_processes_mutex.lock();
defer self.child_processes_mutex.unlock();
// We need to be able to clean up at some point in the future, but we don't // We need to be able to clean up at some point in the future, but we don't
// care about these processes otherwise // care about these processes otherwise
const process = try self.allocator.create(Process); const process = try self.allocator.create(Process);
@ -81,10 +76,6 @@ const SpeechHandler = struct {
// This code should present that // This code should present that
if (self.reclaiming.cmpxchgStrong(false, true, .acquire, .acquire)) |_| return; if (self.reclaiming.cmpxchgStrong(false, true, .acquire, .acquire)) |_| return;
defer self.reclaiming.store(false, .release); defer self.reclaiming.store(false, .release);
self.child_processes_mutex.lock();
defer self.child_processes_mutex.unlock();
if (!reap_all and self.child_processes.items.len <= max_children) return; if (!reap_all and self.child_processes.items.len <= max_children) return;
std.log.debug("Reclaiming memory from {s} processes", .{if (reap_all) "ALL" else "completed"}); std.log.debug("Reclaiming memory from {s} processes", .{if (reap_all) "ALL" else "completed"});
if (self.child_processes.items.len == 0) return; if (self.child_processes.items.len == 0) return;
@ -275,10 +266,6 @@ fn signalAction(sig: i32, info: *const std.posix.siginfo_t, _: ?*anyopaque) call
if (sig == std.posix.SIG.CHLD) { if (sig == std.posix.SIG.CHLD) {
const pid = info.fields.common.first.piduid.pid; const pid = info.fields.common.first.piduid.pid;
std.log.debug("SIGCHLD on pid {d}", .{pid}); std.log.debug("SIGCHLD on pid {d}", .{pid});
handler.child_processes_mutex.lock();
defer handler.child_processes_mutex.unlock();
for (handler.child_processes.items) |proc| { for (handler.child_processes.items) |proc| {
if (proc.child) |child| { if (proc.child) |child| {
if (child.id == pid) { if (child.id == pid) {