summaryrefslogtreecommitdiff
path: root/src/ShaderBuild.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/ShaderBuild.zig')
-rw-r--r--src/ShaderBuild.zig23
1 files changed, 16 insertions, 7 deletions
diff --git a/src/ShaderBuild.zig b/src/ShaderBuild.zig
index b50999a5..e5b6680b 100644
--- a/src/ShaderBuild.zig
+++ b/src/ShaderBuild.zig
@@ -76,7 +76,8 @@ const Result = union(enum) {
spirv: struct { bytes: []u8, source: u64, animated: bool },
};
-/// One compile of the stale files, on its own thread.
+/// One compile of the stale files, a task of its own: `deinit` cancels it
+/// (glslc's wait is a cancelation point) rather than waiting out a glslc.
const Job = struct {
io: std.Io,
gpa: std.mem.Allocator,
@@ -86,7 +87,10 @@ const Job = struct {
results: [max]Result = @splat(.none),
len: usize = 0,
done: std.atomic.Value(bool) = .init(false),
- thread: std.Thread = undefined,
+ /// Set before the cancel: the files after the one it stopped are not
+ /// compiled either (a cancel is said once, to the wait it lands in).
+ stop: std.atomic.Value(bool) = .init(false),
+ future: std.Io.Future(void) = undefined,
};
files: [max]File = @splat(.{}),
@@ -105,7 +109,7 @@ pub fn sync(b: *Build, gpa: std.mem.Allocator, io: std.Io, core: *pardes.Pardes,
var collected = false;
if (b.job) |job| {
if (!job.done.load(.acquire)) return false;
- job.thread.join();
+ job.future.await(job.io);
b.job = null;
b.collect(gpa, core, job);
collected = true;
@@ -148,7 +152,7 @@ pub fn sync(b: *Build, gpa: std.mem.Allocator, io: std.Io, core: *pardes.Pardes,
job.len += 1;
file.stale = false;
}
- job.thread = std.Thread.spawn(.{}, compile, .{job}) catch {
+ job.future = io.concurrent(compile, .{job}) catch {
for (job.paths[0..job.len]) |path| gpa.free(path);
gpa.destroy(job);
return collected;
@@ -174,7 +178,8 @@ pub fn view(b: *const Build, chain: *const Chain, out: *[max]Pass) []const Pass
pub fn deinit(b: *Build, gpa: std.mem.Allocator, fd: c_int, watches: *file_watch.Table) void {
if (b.job) |job| {
- job.thread.join();
+ job.stop.store(true, .release);
+ job.future.cancel(job.io);
freeJob(gpa, job);
}
for (b.files[0..b.len]) |file| free(gpa, file);
@@ -245,7 +250,10 @@ fn expand(buf: *[4096]u8, path: []const u8) []const u8 {
/// build's own flags (build.zig compileGlsl), source on stdin, SPIR-V on
/// stdout.
fn compile(job: *Job) void {
- for (job.paths[0..job.len], 0..) |path, i| job.results[i] = compileOne(job.gpa, job.io, path, job.known[i]);
+ for (job.paths[0..job.len], 0..) |path, i| {
+ if (job.stop.load(.acquire)) break;
+ job.results[i] = compileOne(job.gpa, job.io, path, job.known[i]);
+ }
job.done.store(true, .release);
if (job.wake.call) |call| call(job.wake.ctx);
}
@@ -378,7 +386,8 @@ test "a save that changes a file compiles it again, a failed one keeps the last
fn run(build: *Build, c: *pardes.Pardes, f: c_int, w: *file_watch.Table) void {
_ = build.sync(std.testing.allocator, std.testing.io, c, f, w, .{});
while (build.job) |job| {
- while (!job.done.load(.acquire)) std.Thread.yield() catch {};
+ job.future.await(std.testing.io);
+ job.done.store(true, .release);
_ = build.sync(std.testing.allocator, std.testing.io, c, f, w, .{});
}
}