Skip to content

simplify wait() #58595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 1, 2025
Merged

simplify wait() #58595

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3846aac
`wait()`: just typeassert instead of asserting `isa`
nsajko May 31, 2025
764026d
use `===` instead of `isa`, it can be cheaper AFAIK
nsajko May 31, 2025
dbbf71a
simplify control flow per Keno's suggestion
nsajko May 31, 2025
2edc278
elide typeassert and add explicit return
nsajko May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions base/task.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,30 +1201,19 @@ function wait()
process_events()

# get the next task to run
result = nothing
have_result = false
W = workqueue_for(Threads.threadid())
task = trypoptask(W)
if !(task isa Task)
if task === nothing
# No tasks to run; switch to the scheduler task to run the
# thread sleep logic.
sched_task = get_sched_task()
if ct !== sched_task
result = yieldto(sched_task)
have_result = true
else
task = ccall(:jl_task_get_next, Ref{Task}, (Any, Any, Any),
trypoptask, W, checktaskempty)
return yieldto(sched_task)
end
task = ccall(:jl_task_get_next, Ref{Task}, (Any, Any, Any), trypoptask, W, checktaskempty)
end
# We may have already switched tasks (via the scheduler task), so
# only switch if we haven't.
if !have_result
@assert task isa Task
set_next_task(task)
result = try_yieldto(ensure_rescheduled)
end
return result
set_next_task(task)
return try_yieldto(ensure_rescheduled)
end

if Sys.iswindows()
Expand Down