* [PATCH] socket/pure_ruby: fix Ruby 1.8 compatibility
@ 2015-11-04 21:43 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2015-11-04 21:43 UTC (permalink / raw)
To: mogilefs-client-public
For non-kgio users, IO#wait_readable did not appear until Ruby 2.0.
Additionally, optimistically perform reads before waiting because
EOF handling behavior differs in current revisions of Ruby 2.3.0dev.
---
lib/mogilefs/socket/pure_ruby.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/mogilefs/socket/pure_ruby.rb b/lib/mogilefs/socket/pure_ruby.rb
index 7530a40..e74bbef 100644
--- a/lib/mogilefs/socket/pure_ruby.rb
+++ b/lib/mogilefs/socket/pure_ruby.rb
@@ -23,15 +23,15 @@ class MogileFS::Socket < Socket
sock
end
- def wait_writable(timeout)
+ def wait_writable(timeout = nil)
IO.select(nil, [ self ], nil, timeout)
end unless self.instance_methods.include?(:wait_writable) # Ruby <2.0.0
def timed_read(len, dst = "", timeout = 5)
begin
- wait_readable(timeout) or unreadable_socket!(timeout)
return read_nonblock(len, dst)
rescue Errno::EAGAIN
+ wait(timeout) or unreadable_socket!(timeout)
rescue EOFError
return
end while true
@@ -39,10 +39,10 @@ class MogileFS::Socket < Socket
def timed_peek(len, dst, timeout = 5)
begin
- wait_readable(timeout) or unreadable_socket!(timeout)
rc = recv_nonblock(len, Socket::MSG_PEEK)
return rc.empty? ? nil : dst.replace(rc)
rescue Errno::EAGAIN
+ wait(timeout) or unreadable_socket!(timeout)
rescue EOFError
dst.replace("")
return
--
EW
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-11-04 21:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-04 21:43 [PATCH] socket/pure_ruby: fix Ruby 1.8 compatibility Eric Wong
Code repositories for project(s) associated with this public inbox
https://yhbt.net/mogilefs-client.git/
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).