diff --git a/lib/std/Thread.zig b/lib/std/Thread.zig index f2203e28084541c97a2ff05e13d3ebb2c9a61c78..83c2992a4503bb9c07b4bb6151a4044076dbf895 100644 --- a/lib/std/Thread.zig +++ b/lib/std/Thread.zig @@ -1151,3 +1151,27 @@ test "Thread.detach" { event.wait(); try std.testing.expectEqual(value, 1); } + +fn testWaitForSignal(mutex: *Mutex, cond: *Condition) void { + mutex.lock(); + defer mutex.unlock(); + cond.signal(); + cond.wait(mutex); +} + +test "Condition.signal" { + if (builtin.single_threaded) return error.SkipZigTest; + + var mutex = Mutex{}; + var cond = Condition{}; + + var thread: Thread = undefined; + { + mutex.lock(); + defer mutex.unlock(); + thread = try Thread.spawn(.{}, testWaitForSignal, .{ &mutex, &cond }); + cond.wait(&mutex); + cond.signal(); + } + thread.join(); +} diff --git a/lib/std/Thread/Condition.zig b/lib/std/Thread/Condition.zig index 615f68cd9bab35dd11d9064f73f3717ffab25a9c..848e17ddced0b043ebd53620e869b13084816713 100644 --- a/lib/std/Thread/Condition.zig +++ b/lib/std/Thread/Condition.zig @@ -106,7 +106,7 @@ pub const AtomicCondition = struct { .linux => { switch (linux.getErrno(linux.futex_wait( &cond.futex, - linux.FUTEX_PRIVATE_FLAG | linux.FUTEX_WAIT, + linux.FUTEX.PRIVATE_FLAG | linux.FUTEX.WAIT, 0, null, ))) { @@ -128,7 +128,7 @@ pub const AtomicCondition = struct { .linux => { switch (linux.getErrno(linux.futex_wake( &cond.futex, - linux.FUTEX_PRIVATE_FLAG | linux.FUTEX_WAKE, + linux.FUTEX.PRIVATE_FLAG | linux.FUTEX.WAKE, 1, ))) { .SUCCESS => {},