-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make Distributed.Worker threadsafe (#37905)
- Loading branch information
1 parent
db8e940
commit 444aa87
Showing
3 changed files
with
59 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
using Test | ||
using Distributed, Base.Threads | ||
using Base.Iterators: product | ||
|
||
exeflags = ("--startup-file=no", | ||
"--check-bounds=yes", | ||
"--depwarn=error", | ||
"--threads=2") | ||
|
||
function call_on(f, wid, tid) | ||
remotecall(wid) do | ||
t = Task(f) | ||
ccall(:jl_set_task_tid, Cvoid, (Any, Cint), t, tid-1) | ||
schedule(t) | ||
@assert threadid(t) == tid | ||
t | ||
end | ||
end | ||
|
||
# Run function on process holding the data to only serialize the result of f. | ||
# This becomes useful for things that cannot be serialized (e.g. running tasks) | ||
# or that would be unnecessarily big if serialized. | ||
fetch_from_owner(f, rr) = remotecall_fetch(f∘fetch, rr.where, rr) | ||
|
||
isdone(rr) = fetch_from_owner(istaskdone, rr) | ||
isfailed(rr) = fetch_from_owner(istaskfailed, rr) | ||
|
||
@testset "RemoteChannel allows put!/take! from thread other than 1" begin | ||
ws = ts = product(1:2, 1:2) | ||
timeout = 10.0 | ||
@testset "from worker $w1 to $w2 via 1" for (w1, w2) in ws | ||
@testset "from thread $w1.$t1 to $w2.$t2" for (t1, t2) in ts | ||
# We want (the default) lazyness, so that we wait for `Worker.c_state`! | ||
procs_added = addprocs(2; exeflags, lazy=true) | ||
@everywhere procs_added using Base.Threads | ||
p1 = procs_added[w1] | ||
p2 = procs_added[w2] | ||
chan_id = first(procs_added) | ||
chan = RemoteChannel(chan_id) | ||
send = call_on(p1, t1) do | ||
put!(chan, nothing) | ||
end | ||
recv = call_on(p2, t2) do | ||
take!(chan) | ||
end | ||
timedwait(() -> isdone(send) && isdone(recv), timeout) | ||
@test isdone(send) | ||
@test isdone(recv) | ||
@test !isfailed(send) | ||
@test !isfailed(recv) | ||
rmprocs(procs_added) | ||
end | ||
end | ||
end |
444aa87
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Executing the daily benchmark build, I will reply here when finished:
@nanosoldier
runbenchmarks(ALL, isdaily = true)
444aa87
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Executing the daily package evaluation, I will reply here when finished:
@nanosoldier
runtests(ALL, isdaily = true)
444aa87
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Your benchmark job has completed - successfully executed benchmarks. A full report can be found here. cc @christopher-dG
444aa87
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Your package evaluation job has completed - possible new issues were detected. A full report can be found here. cc @maleadt