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 '095_quiz_async: Add missing Bug 4' (#396) from tjk/ziglings-exercises:95-bug4 into main

Browse Source 
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/396
This commit is contained in:
Chris Boesch
2026-04-14 12:53:03 +02:00
parent 152f3a6113 f10c3d4e7a
commit a4efd69e11
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
exercises/095_quiz_async.zig
View File

@@ -97,9 +97,8 @@ pub fn main(init: std.process.Init) !void {
// there's no more data coming. // there's no more data coming.
queue.close(io); queue.close(io);
// Wait for the collector to drain the remaining queue. // Bug 4: How do we wait for the collector to drain the remaining queue?
_ = collector_future.await(io); _ = collector_future.???(io);
// _ = collector_future.???(io);
// Now write the garden report. This is critical — it must // Now write the garden report. This is critical — it must
// NOT be interrupted, even if something tries to cancel us! // NOT be interrupted, even if something tries to cancel us!

16
patches/patches/095_quiz_async.patch
View File

@@ -1,5 +1,5 @@
--- exercises/095_quiz_async.zig 2026-04-06 19:55:17.111817364 +0200 --- exercises/095_quiz_async.zig 2026-04-13 19:11:04.173440326 -0700
+++ answers/095_quiz_async.zig 2026-04-06 19:56:16.063974543 +0200 +++ answers/095_quiz_async.zig 2026-04-13 19:10:31.618592222 -0700
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
fn addReading(self: *GardenWeather, io: std.Io, reading: Reading) void { fn addReading(self: *GardenWeather, io: std.Io, reading: Reading) void {
// Bug 1: The collector needs to lock before modifying // Bug 1: The collector needs to lock before modifying
@@ -18,7 +18,7 @@
defer _ = collector_future.cancel(io); defer _ = collector_future.cancel(io);
// Sensor group: the sensors can use async — they just need // Sensor group: the sensors can use async — they just need
@@ -91,7 +91,7 @@ @@ -91,22 +91,22 @@
// Bug 3: Wait for ALL sensors to finish sending their readings. // Bug 3: Wait for ALL sensors to finish sending their readings.
// What Group method blocks until all tasks complete? // What Group method blocks until all tasks complete?
@@ -27,11 +27,11 @@
// All sensors done — close the queue so the collector knows // All sensors done — close the queue so the collector knows
// there's no more data coming. // there's no more data coming.
@@ -99,15 +99,14 @@ queue.close(io);
// Wait for the collector to drain the remaining queue. // Bug 4: How do we wait for the collector to drain the remaining queue?
_ = collector_future.await(io); - _ = collector_future.???(io);
- // _ = collector_future.???(io); + _ = collector_future.await(io);
// Now write the garden report. This is critical — it must // Now write the garden report. This is critical — it must
// NOT be interrupted, even if something tries to cancel us! // NOT be interrupted, even if something tries to cancel us!
@@ -45,7 +45,7 @@
printGardenReport(&weather); printGardenReport(&weather);
} }
@@ -129,7 +128,7 @@ @@ -128,7 +128,7 @@
// Bug 6: Send the reading into the queue. // Bug 6: Send the reading into the queue.
// What Queue method sends a single element? // What Queue method sends a single element?