summaryrefslogtreecommitdiff
path: root/src/selection_pipe.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/selection_pipe.zig')
-rw-r--r--src/selection_pipe.zig11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/selection_pipe.zig b/src/selection_pipe.zig
index c3e5e3a6..229b3d67 100644
--- a/src/selection_pipe.zig
+++ b/src/selection_pipe.zig
@@ -401,7 +401,7 @@ pub fn runIn(
},
};
child.stdin = null; // writer_context owns and closes this endpoint
- var writer: ?std.Thread = std.Thread.spawn(.{}, writeInput, .{writer_context}) catch {
+ var writer: ?std.Io.Future(void) = io.concurrent(writeInput, .{writer_context}) catch {
writer_context.file.close(io);
gpa.free(writer_context.input);
gpa.destroy(writer_context);
@@ -410,8 +410,9 @@ pub fn runIn(
};
// On every early return (a timeout, a ceiling) the answer goes at once:
// the group is killed and the shell left to be reaped elsewhere
- // (abandon), and the writer, which owns its input, let go.
- defer if (writer) |thread| thread.detach();
+ // (abandon), and the writer's write canceled (it closes and frees what
+ // it owns as it ends).
+ defer if (writer) |*w| w.cancel(io);
defer if (child.id != null) abandonNow(io, &child, pid);
defer if (token != 0) Running.remove(pid);
if (token != 0 and !Running.add(token, pid)) return fail.k(.signal);
@@ -443,7 +444,9 @@ pub fn runIn(
multi_reader.checkAnyError() catch return fail.k(.io);
if (token != 0) Running.remove(pid);
const term = child.wait(io) catch return fail.k(.io);
- writer.?.join();
+ // A cancel of this job reaches the write too: a grandchild that keeps
+ // stdin open and never reads holds no worker.
+ writer.?.await(io);
writer = null;
const stdout = multi_reader.toOwnedSlice(0) catch return fail.k(.io);