summaryrefslogtreecommitdiff
path: root/lib/net/protocol.rb
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-15 20:11:23 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-15 20:11:23 +0000
commitb90ad8a2f68251343569fd8824c4bcfeb25188a7 (patch)
tree08d0637c25ff6c0582e2bc6e44945cacc4f085d6 /lib/net/protocol.rb
parentdc3c2496bb9b86b8837b23e83a83d896236c2eca (diff)
lib/net/*: use io/wait methods instead of IO.select
io/wait is expected to work on any platform where sockets are supported. io/wait methods uses fewer allocations and uses ppoll internally under Linux for better performance on high-numbered FDs. [ruby-core:35572] describes the performance advantage of ppoll on high-numbered FDs. * lib/net/protocol.rb (rbuf_fill): use IO#wait_*able * lib/net/http/generic_request.rb (wait_for_continue): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net/protocol.rb')
-rw-r--r--lib/net/protocol.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 5a20c5d515..28833a25ef 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -20,6 +20,7 @@
require 'socket'
require 'timeout'
+require 'io/wait'
module Net # :nodoc:
@@ -153,12 +154,12 @@ module Net # :nodoc:
when String
return @rbuf << rv
when :wait_readable
- IO.select([@io], nil, nil, @read_timeout) or raise Net::ReadTimeout
+ @io.to_io.wait_readable(@read_timeout) or raise Net::ReadTimeout
# continue looping
when :wait_writable
# OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
# http://www.openssl.org/support/faq.html#PROG10
- IO.select(nil, [@io], nil, @read_timeout) or raise Net::ReadTimeout
+ @io.to_io.wait_writable(@read_timeout) or raise Net::ReadTimeout
# continue looping
when nil
# callers do not care about backtrace, so avoid allocating for it