Return :timed_out instead of :timeout like Base.timedwait

JuliaLang · Jan 10, 2025 · ee1a4cb · ee1a4cb
1 parent 0d2c642
commit ee1a4cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/base/condition.jl b/base/condition.jl
@@ -134,7 +134,7 @@ If the keyword `first` is set to `true`, the waiter will be put _first_
 in line to wake up on `notify`. Otherwise, `wait` has first-in-first-out (FIFO) behavior.
 
 If `timeout` is specified, cancel the `wait` when it expires and return
-`:timeout`. The minimum value for `timeout` is 0.001 seconds, i.e. 1
+`:timed_out`. The minimum value for `timeout` is 0.001 seconds, i.e. 1
 millisecond.
 """
 function wait(c::GenericCondition; first::Bool=false, timeout::Real=0.0)
@@ -167,7 +167,7 @@ function wait(c::GenericCondition; first::Bool=false, timeout::Real=0.0)
             end
             unlock(c.lock)
             # send the waiting task a timeout
-            dosched && schedule(ct, :timeout)
+            dosched && schedule(ct, :timed_out)
         end
         t.sticky = false
         Threads._spawn_set_thrpool(t, :interactive)

diff --git a/test/channels.jl b/test/channels.jl
@@ -43,7 +43,7 @@ end
 @testset "timed wait on Condition" begin
     a = Threads.Condition()
     @test_throws ArgumentError @lock a wait(a; timeout=0.0005)
-    @test @lock a wait(a; timeout=0.1)==:timeout
+    @test @lock a wait(a; timeout=0.1)==:timed_out
     lock(a)
     @spawn begin
         @lock a notify(a)