From: Eric Wong <normalperson@yhbt.net>
To: mogilefs-client-public@bogomips.org
Cc: Eric Wong <normalperson@yhbt.net>
Subject: [PATCH] mogilefs/socket/pure_ruby: use IO#wait_*able
Date: Wed, 24 Jun 2015 01:56:59 +0000 [thread overview]
Message-ID: <1435111019-25068-1-git-send-email-normalperson@yhbt.net> (raw)
IO#wait_*able methods may use the more efficient ppoll syscall under
Linux to avoid performance penalties with high-numbered FDs. Use
them if available. IO#wait_readable has been around since the 1.8
days at least, and IO#wait_writable was added in Ruby 2.0.0
---
lib/mogilefs/socket/pure_ruby.rb | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/mogilefs/socket/pure_ruby.rb b/lib/mogilefs/socket/pure_ruby.rb
index 8833d22..7530a40 100644
--- a/lib/mogilefs/socket/pure_ruby.rb
+++ b/lib/mogilefs/socket/pure_ruby.rb
@@ -1,5 +1,6 @@
# -*- encoding: binary -*-
# internal implementation details here, do not rely on them in your code
+require 'io/wait'
class MogileFS::Socket < Socket
include MogileFS::SocketCommon
@@ -15,16 +16,20 @@ class MogileFS::Socket < Socket
def self.tcp(host, port, timeout = 5)
sock = start(host, port)
- unless IO.select(nil, [ sock ], nil, timeout)
+ unless sock.wait_writable(timeout)
sock.close
raise MogileFS::Timeout, 'socket connect timeout'
end
sock
end
+ def wait_writable(timeout)
+ 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
- IO.select([self], nil, nil, timeout) or unreadable_socket!(timeout)
+ wait_readable(timeout) or unreadable_socket!(timeout)
return read_nonblock(len, dst)
rescue Errno::EAGAIN
rescue EOFError
@@ -34,7 +39,7 @@ class MogileFS::Socket < Socket
def timed_peek(len, dst, timeout = 5)
begin
- IO.select([self], nil, nil, timeout) or unreadable_socket!(timeout)
+ wait_readable(timeout) or unreadable_socket!(timeout)
rc = recv_nonblock(len, Socket::MSG_PEEK)
return rc.empty? ? nil : dst.replace(rc)
rescue Errno::EAGAIN
@@ -61,8 +66,7 @@ class MogileFS::Socket < Socket
buf = buf.slice(rc, buf.bytesize)
end
rescue Errno::EAGAIN
- IO.select(nil, [self], nil, timeout) or
- request_truncated!(written, expect, timeout)
+ wait_writable(timeout) or request_truncated!(written, expect, timeout)
end while true
end
end
--
EW
reply other threads:[~2015-06-24 1:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/mogilefs-client/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435111019-25068-1-git-send-email-normalperson@yhbt.net \
--to=normalperson@yhbt.net \
--cc=mogilefs-client-public@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).