Skip to content
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

Jump to bottom

Check channel state on iterate #52981

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Check channel state on iterate #52981

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
9 changes: 9 additions & 0 deletions base/channels.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,15 @@ function iterate(c::Channel, state=nothing)
end
end
else
# If the channel was closed with an exception, it needs to be thrown
if (@atomic :acquire c.state) === :closed
e = c.excp
if isa(e, InvalidStateException) && e.state === :closed
nothing
else
throw(e)
end
end
return nothing
end
end
Expand Down
23 changes: 23 additions & 0 deletions test/channels.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,12 +499,35 @@ end
end
end

struct CustomError <: Exception end

@testset "check_channel_state" begin
c = Channel(1)
close(c)
@test !isopen(c)
c.excp === nothing # to trigger the branch
@test_throws InvalidStateException Base.check_channel_state(c)

# Issue 52974 - closed channels with exceptions
# must be thrown on iteration, if channel is empty
c = Channel(2)
put!(c, 5)
close(c, CustomError())
@test take!(c) == 5
@test_throws CustomError iterate(c)

c = Channel(Inf)
put!(c, 1)
close(c)
@test take!(c) == 1
@test_throws InvalidStateException take!(c)
@test_throws InvalidStateException put!(c, 5)

c = Channel(3)
put!(c, 1)
close(c)
@test first(iterate(c)) == 1
@test isnothing(iterate(c))
end

# PR #36641
Expand Down