aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/connection/stream_event_loop.rb
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-10-06 10:31:14 +1030
committerMatthew Draper <matthew@trebex.net>2016-10-06 10:31:14 +1030
commit4a7c5685c86d0349c98b2725ad01aa70ebcc3581 (patch)
treebaadb3ec9881ed879203967f993fcbd19196a14a /actioncable/lib/action_cable/connection/stream_event_loop.rb
parentde9a56b66af928a09f85daf15ffb1c2023a7c1b8 (diff)
downloadrails-4a7c5685c86d0349c98b2725ad01aa70ebcc3581.tar.gz
rails-4a7c5685c86d0349c98b2725ad01aa70ebcc3581.tar.bz2
rails-4a7c5685c86d0349c98b2725ad01aa70ebcc3581.zip
Close the IO from the read loop thread
IO#close and IO#read across threads don't get along so well: After T1 enters #read and releases the GVL, T2 can call #close on the IO, thereby both closing the fd and freeing the buffer while T1 is using them.
Diffstat (limited to 'actioncable/lib/action_cable/connection/stream_event_loop.rb')
-rw-r--r--actioncable/lib/action_cable/connection/stream_event_loop.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actioncable/lib/action_cable/connection/stream_event_loop.rb b/actioncable/lib/action_cable/connection/stream_event_loop.rb
index eec24638b6..2d1af0ff9f 100644
--- a/actioncable/lib/action_cable/connection/stream_event_loop.rb
+++ b/actioncable/lib/action_cable/connection/stream_event_loop.rb
@@ -36,6 +36,7 @@ module ActionCable
@todo << lambda do
@nio.deregister io
@map.delete io
+ io.close
end
wakeup
end