From 348d715eaa24989fffd02c3c073188d555969bb8 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 2 Dec 2008 06:34:19 +0000 Subject: [PATCH] * lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): use read_nonblock instead of sysread wrapped by timeout to boost performance. a patch from Aaron Patterson in [ruby-core:20191]. fix #806 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/net/protocol.rb | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb8e4552c1..143335fed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 2 15:31:42 2008 Yukihiro Matsumoto + + * lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): use + read_nonblock instead of sysread wrapped by timeout to boost + performance. a patch from Aaron Patterson in [ruby-core:20191]. + fix #806 + Mon Dec 1 23:23:52 2008 Yuki Sonoda (Yugui) * set 1.9.1-p5000 into version number. [ruby-dev:36998] diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 0d489cdbc8..3f6f416bab 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -131,9 +131,15 @@ module Net # :nodoc: BUFSIZE = 1024 * 16 def rbuf_fill - timeout(@read_timeout) { - @rbuf << @io.sysread(BUFSIZE) - } + begin + @rbuf << @io.read_nonblock(BUFSIZE) + rescue Errno::EWOULDBLOCK + if IO.select([@io], nil, nil, @read_timeout) + @rbuf << @io.read_nonblock(BUFSIZE) + else + raise Timeout::TimeoutError + end + end end def rbuf_consume(len)