diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-02 06:34:19 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-02 06:34:19 +0000 |
| commit | 641fe29855bae159338b0ab978472ef3f77eee5c (patch) | |
| tree | 4cd51b748905331b8278633c02f7f1918ef965b2 | |
| parent | b25aaa73528a71e47ad318d10c5d2ffb9a982888 (diff) | |
| download | ruby-641fe29855bae159338b0ab978472ef3f77eee5c.tar.gz ruby-641fe29855bae159338b0ab978472ef3f77eee5c.tar.xz ruby-641fe29855bae159338b0ab978472ef3f77eee5c.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@20443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/net/protocol.rb | 12 |
2 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Tue Dec 2 15:31:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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) <yugui@yugui.jp> * set 1.9.1-p5000 into version number. [ruby-dev:36998] diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 0d489cdbc..3f6f416ba 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) |