Add throw keyword argument in waitany

JuliaLang · Mar 6, 2024 · dace55a · dace55a
1 parent 0501a1a
commit dace55a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/base/task.jl b/base/task.jl
@@ -366,10 +366,10 @@ function wait(t::Task)
 end
 
 # Wait multiple tasks
-waitany(tasks) = _wait_multiple(tasks)
-waitall(tasks; failfast=false, throw=false) = _wait_multiple(tasks, true, failfast, throw)
+waitany(tasks; throw=false) = _wait_multiple(tasks, throw)
+waitall(tasks; failfast=false, throw=false) = _wait_multiple(tasks, throw, true, failfast)
 
-function _wait_multiple(waiting_tasks, all=false, failfast=false, throwexc=false)
+function _wait_multiple(waiting_tasks, throwexc=false, all=false, failfast=false)
     tasks = Task[]
 
     for t in waiting_tasks
@@ -409,7 +409,7 @@ function _wait_multiple(waiting_tasks, all=false, failfast=false, throwexc=false
     if nremaining == 0
         return tasks, Task[]
     elseif any(done_mask) && (!all || (failfast && exception))
-        if throwexc && failfast && exception
+        if throwexc && (!all || failfast) && exception
             exceptions = [t.exception for t in tasks[done_mask] if istaskfailed(t)]
             throw(CompositeException(exceptions))
         else

diff --git a/test/threads_exec.jl b/test/threads_exec.jl
@@ -1218,15 +1218,28 @@ end
 
     for tasks_type in (Vector{Task}, Set{Task}, Tuple{Task})
         @testset "waitany" begin
-            tasks, event = create_tasks()
-            sleep(0.1)
-            done,  pending = waitany(convert_tasks(tasks_type, tasks))
-            @test length(done) == 2
-            @test tasks[1] ∈ done
-            @test tasks[2] ∈ done
-            @test length(pending) == 1
-            @test tasks[3] ∈ pending
-            teardown(tasks, event)
+            @testset "no options" begin
+                tasks, event = create_tasks()
+                sleep(0.1)
+                done,  pending = waitany(convert_tasks(tasks_type, tasks))
+                @test length(done) == 2
+                @test tasks[1] ∈ done
+                @test tasks[2] ∈ done
+                @test length(pending) == 1
+                @test tasks[3] ∈ pending
+                teardown(tasks, event)
+            end
+
+            @testset "throw=true" begin
+                tasks, event = create_tasks()
+                push!(tasks, Threads.@spawn error("Error"))
+
+                @test_throws CompositeException begin
+                    waitany(convert_tasks(tasks_type, tasks); throw=true)
+                end
+
+                teardown(tasks, event)
+            end
         end
 
         @testset "waitall" begin