From 890df4a6586d1f09b4da8cfd1e70a389fd16fef4 Mon Sep 17 00:00:00 2001 From: normal Date: Wed, 6 May 2015 20:30:43 +0000 Subject: stdlib: use IO#wait_*able instead of IO.select when possible In case a process encounters high-numbered FDs, this allows consistent performance on systems with ppoll support. [ruby-core:35572] * ext/socket/lib/socket.rb (connect_nonblock): use IO#wait_writable * lib/drb/drb.rb (DRB::DRbTCPSocket#alive?): use IO#wait_readable * lib/webrick/httpserver.rb (run): ditto * lib/resolv.rb (request): ditto for single socket case [ruby-core:68943] [Feature #11081] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/resolv.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/resolv.rb') diff --git a/lib/resolv.rb b/lib/resolv.rb index e67dff9704..9083bd0b53 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1,6 +1,7 @@ require 'socket' require 'timeout' require 'thread' +require 'io/wait' begin require 'securerandom' @@ -680,7 +681,11 @@ class Resolv if timeout <= 0 raise ResolvTimeout end - select_result = IO.select(@socks, nil, nil, timeout) + if @socks.size == 1 + select_result = @socks[0].wait_readable(timeout) ? [ @socks ] : nil + else + select_result = IO.select(@socks, nil, nil, timeout) + end if !select_result after_select = Time.now next if after_select < timelimit -- cgit v1.2.3