fix #32575, channel trying to switch to task on another thread (#32584)

JuliaLang · Jul 16, 2019 · 80361a7 · 80361a7
1 parent 9b987cc
commit 80361a7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/base/channels.jl b/base/channels.jl
@@ -304,8 +304,8 @@ function put_unbuffered(c::Channel, v)
     finally
         unlock(c)
     end
-    # unfair version of: schedule(taker, v); yield()
-    yield(taker, v) # immediately give taker a chance to run, but don't block the current task
+    schedule(taker, v)
+    yield()  # immediately give taker a chance to run, but don't block the current task
     return v
 end
 

diff --git a/test/threads_exec.jl b/test/threads_exec.jl
@@ -665,3 +665,12 @@ let timeout = 300 # this test should take about 1-10 seconds
     end
     close(t) # stop the watchdog
 end
+
+# issue #32575
+let ch = Channel{Char}(0), t
+    t = Task(()->for v in "hello" put!(ch, v) end)
+    t.sticky = false
+    bind(ch, t)
+    schedule(t)
+    @test String(collect(ch)) == "hello"
+end