* [PATCH] lib/net/*: use io/wait methods instead of IO.select
@ 2015-04-13 2:22 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2015-04-13 2:22 UTC (permalink / raw)
To: spew
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
---
lib/net/http/generic_request.rb | 2 +-
lib/net/protocol.rb | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/net/http/generic_request.rb b/lib/net/http/generic_request.rb
index 00ff434..9b7d287 100644
--- a/lib/net/http/generic_request.rb
+++ b/lib/net/http/generic_request.rb
@@ -309,7 +309,7 @@ class Net::HTTPGenericRequest
def wait_for_continue(sock, ver)
if ver >= '1.1' and @header['expect'] and
@header['expect'].include?('100-continue')
- if IO.select([sock.io], nil, nil, sock.continue_timeout)
+ if sock.io.to_io.wait_readable(sock.continue_timeout)
res = Net::HTTPResponse.read_new(sock)
unless res.kind_of?(Net::HTTPContinue)
res.decode_content = @decode_content
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 5a20c5d..28833a2 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
--
EW
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-13 2:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-13 2:22 [PATCH] lib/net/*: use io/wait methods instead of IO.select Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).