Skip to content

Ensure correct type parameter of serialized RemoteChannel (forwardport of JuliaLang/Distributed.jl#179) #36

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

Closed
DilumAluthge wants to merge 1 commit into from
Closed

Ensure correct type parameter of serialized RemoteChannel (forwardport of JuliaLang/Distributed.jl#179) #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/remotecall.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ function serialize(s::AbstractSerializer, ::Future)
invoke(serialize, Tuple{AbstractSerializer, Any}, s, zero_fut)
end

function serialize(s::AbstractSerializer, ::RemoteChannel)
zero_rc = RemoteChannel{Channel{Any}}((0,0,0))
function serialize(s::AbstractSerializer, ::RemoteChannel{T}) where T
zero_rc = RemoteChannel{T}((0,0,0))
invoke(serialize, Tuple{AbstractSerializer, Any}, s, zero_rc)
end

Expand Down
8 changes: 6 additions & 2 deletions test/distributed_exec.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,9 +343,12 @@ end
@testset "Ser/deser to non-ClusterSerializer objects" begin
function test_regular_io_ser(ref::DistributedNext.AbstractRemoteRef)
io = IOBuffer()
serialize(io, ref)
# Wrapping the ref in a Dict to exercise the case when the
# type parameter of the RemoteChannel is part of an outer type.
# See https://github.com/JuliaLang/Distributed.jl/issues/178
serialize(io, Dict("ref" => ref))
seekstart(io)
ref2 = deserialize(io)
ref2 = deserialize(io)["ref"]
for fld in fieldnames(typeof(ref))
v = getfield(ref2, fld)
if isa(v, Number)
Expand All @@ -361,6 +364,7 @@ end

test_regular_io_ser(Future())
test_regular_io_ser(RemoteChannel())
test_regular_io_ser(RemoteChannel(() -> Channel{Bool}(1)))
end

@testset "@distributed and [un]buffered reads" begin
Expand Down
Loading