sam_oneal/ziglings
1
0
Fork 0
mirror of https://codeberg.org/ziglings/exercises.git synced 2026-06-08 07:50:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request '093_async9: small fixes' (#400) from tjk/ziglings-exercises:93-async9 into main

Browse Source 
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/400
This commit is contained in:
Chris Boesch
2026-04-14 17:56:35 +02:00
parent a4efd69e11 2afd0f9709
commit 3f11ad1253
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
exercises/093_async9.zig
View File

@@ -33,7 +33,7 @@
// Let's try a slightly simplified example from signal processing: // Let's try a slightly simplified example from signal processing:
// Suppose we're looking for the beginning of a signal above the noise // Suppose we're looking for the beginning of a signal above the noise
// level. To do this, we compare each entry from beginning to end with // level. To do this, we compare each entry from beginning to end with
// the threshold.To speed things up a bit, we split the signal into // the threshold. To speed things up a bit, we split the signal into
// two halves and have two parallel workers search for them. // two halves and have two parallel workers search for them.
// Who finds the beginning first "wins" and thus ends the other one. // Who finds the beginning first "wins" and thus ends the other one.
// //
@@ -61,10 +61,11 @@ pub fn main(init: std.process.Init) !void {
var queue = Io.Queue(SearchResult).init(&buf); var queue = Io.Queue(SearchResult).init(&buf);
// Launch two workers, each searching half the array. // Launch two workers, each searching half the array.
var f1 = ???(searchRange, .{ data[0..mid], target, 0, 0, &queue, io }); // Remember, we want them to be guaranteed separate units of concurrency.
var f1 = ???(searchThreshold, .{ io, data[0..mid], threshold, 0, 0, &queue });
defer _ = f1.cancel(io); defer _ = f1.cancel(io);
var f2 = ???(searchRange, .{ data[mid..], target, mid, 1, &queue, io }); var f2 = ???(searchThreshold, .{ io, data[mid..], threshold, mid, 1, &queue });
defer _ = f2.cancel(io); defer _ = f2.cancel(io);
// Wait for the first result. // Wait for the first result.
@@ -87,7 +88,7 @@ fn searchThreshold(
// all workers would continue until the end. // all workers would continue until the end.
io.sleep(Io.Duration.fromMilliseconds(1), .awake) catch return; io.sleep(Io.Duration.fromMilliseconds(1), .awake) catch return;
// To test this, you can view the work of the workers // To test this, you can uncomment this to view the work of the workers
// and then comment out the pause. // and then comment out the pause.
// print("id: {} - val: {}\n", .{ worker_id, val }); // print("id: {} - val: {}\n", .{ worker_id, val });
@@ -100,4 +101,3 @@ fn searchThreshold(
} }
} }
} }

17
patches/patches/093_async9.patch
View File

@@ -1,20 +1,15 @@
--- exercises/093_async9.zig 2026-04-14 09:50:05.694073287 +0200 --- exercises/093_async9.zig 2026-04-14 08:32:33.014583120 -0700
+++ answers/093_async9.zig 2026-04-14 09:49:58.604934765 +0200 +++ answers/093_async9.zig 2026-04-14 08:32:24.459647047 -0700
@@ -61,10 +61,10 @@ @@ -62,10 +62,10 @@
var queue = Io.Queue(SearchResult).init(&buf);
// Launch two workers, each searching half the array. // Launch two workers, each searching half the array.
- var f1 = ???(searchRange, .{ data[0..mid], target, 0, 0, &queue, io }); // Remember, we want them to be guaranteed separate units of concurrency.
- var f1 = ???(searchThreshold, .{ io, data[0..mid], threshold, 0, 0, &queue });
+ var f1 = try io.concurrent(searchThreshold, .{ io, data[0..mid], threshold, 0, 0, &queue }); + var f1 = try io.concurrent(searchThreshold, .{ io, data[0..mid], threshold, 0, 0, &queue });
defer _ = f1.cancel(io); defer _ = f1.cancel(io);
- var f2 = ???(searchRange, .{ data[mid..], target, mid, 1, &queue, io }); - var f2 = ???(searchThreshold, .{ io, data[mid..], threshold, mid, 1, &queue });
+ var f2 = try io.concurrent(searchThreshold, .{ io, data[mid..], threshold, mid, 1, &queue }); + var f2 = try io.concurrent(searchThreshold, .{ io, data[mid..], threshold, mid, 1, &queue });
defer _ = f2.cancel(io); defer _ = f2.cancel(io);
// Wait for the first result. // Wait for the first result.
@@ -100,4 +100,3 @@
}
}
}
-