* [PATCH] lib/net/protocol.rb (rbuf_fill): avoid exception with read_nonblock
@ 2015-04-07 19:35 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2015-04-07 19:35 UTC (permalink / raw)
To: spew
Exceptions are noisy in debug output and waste allocations.
Use "exception: false" introduced in 2.1 to return symbols for
common errors instead.
Follow-up commits will be prepared to reduce EOFError exceptions
to further quiet debug output and IO.select may be replaced by
io/wait methods if available to reduce allocations.
---
lib/net/protocol.rb | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 2547701..5a20c5d 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -149,23 +149,21 @@ module Net # :nodoc:
BUFSIZE = 1024 * 16
def rbuf_fill
- begin
- @rbuf << @io.read_nonblock(BUFSIZE)
- rescue IO::WaitReadable
- if IO.select([@io], nil, nil, @read_timeout)
- retry
- else
- raise Net::ReadTimeout
- end
- rescue IO::WaitWritable
+ case rv = @io.read_nonblock(BUFSIZE, exception: false)
+ when String
+ return @rbuf << rv
+ when :wait_readable
+ IO.select([@io], nil, nil, @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
- if IO.select(nil, [@io], nil, @read_timeout)
- retry
- else
- raise Net::ReadTimeout
- end
- end
+ IO.select(nil, [@io], nil, @read_timeout) or raise Net::ReadTimeout
+ # continue looping
+ when nil
+ # callers do not care about backtrace, so avoid allocating for it
+ raise EOFError, 'end of file reached', []
+ end while true
end
def rbuf_consume(len)
--
EW
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-07 19:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-07 19:35 [PATCH] lib/net/protocol.rb (rbuf_fill): avoid exception with read_nonblock 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).