From 6e07ca9107a58af6a2fd8ba534f84019fc5a1114 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 20 Oct 2013 00:23:52 +0000 Subject: recheck IO#closed? on thread pools after a short delay The closed IO may not immediately register to all threads due to ordering problems --- lib/yahns/acceptor.rb | 3 ++- lib/yahns/queue_epoll.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/yahns/acceptor.rb b/lib/yahns/acceptor.rb index 43d5fe8..888e4b6 100644 --- a/lib/yahns/acceptor.rb +++ b/lib/yahns/acceptor.rb @@ -21,7 +21,8 @@ module Yahns::Acceptor # :nodoc: queue.fdmap.desperate_expire_for(self, 5) sleep 1 # let other threads do some work rescue => e - break if closed? + # sleep since this check is racy (and uncommon) + break if closed? || (sleep(0.01) && closed?) Yahns::Log.exception(logger, "accept loop", e) end while true end diff --git a/lib/yahns/queue_epoll.rb b/lib/yahns/queue_epoll.rb index 1813581..7df1cc0 100644 --- a/lib/yahns/queue_epoll.rb +++ b/lib/yahns/queue_epoll.rb @@ -46,7 +46,8 @@ class Yahns::Queue < SleepyPenguin::Epoll::IO # :nodoc: end end rescue => e - break if closed? + # sleep since this check is racy (and uncommon) + break if closed? || (sleep(0.01) && closed?) Yahns::Log.exception(logger, 'queue loop', e) end while true end -- cgit v1.2.3-24-ge0c7