From 8478b30267c09152f1be6f55967fa3444e878ea4 Mon Sep 17 00:00:00 2001 From: normal Date: Tue, 17 Nov 2015 01:16:25 +0000 Subject: [PATCH] socket: avoid exceptions in wrapper code * ext/socket/lib/socket.rb (Socket.accept_loop): avoid exceptions (Socket.udp_server_recv): ditto Exceptions for common "errors" make debug output noisy and allocations+backtrace generation hurt performance. [ruby-core:66385] [ruby-core:69473] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/socket/lib/socket.rb | 14 ++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f9d08e95f206c..40005aa138aa92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 17 10:12:30 2015 Eric Wong + + * ext/socket/lib/socket.rb (Socket.accept_loop): avoid exceptions + (Socket.udp_server_recv): ditto + Tue Nov 17 09:59:00 2015 Eric Wong * ext/socket/ancdata.c (bsock_sendmsg_internal): avoid arg parsing diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb index 705a0b8459e8e3..c9929ae1c1e3c4 100644 --- a/ext/socket/lib/socket.rb +++ b/ext/socket/lib/socket.rb @@ -792,11 +792,8 @@ def self.accept_loop(*sockets) # :yield: socket, client_addrinfo loop { readable, _, _ = IO.select(sockets) readable.each {|r| - begin - sock, addr = r.accept_nonblock - rescue IO::WaitReadable - next - end + sock, addr = r.accept_nonblock(exception: false) + next if sock == :wait_readable yield sock, addr } } @@ -960,11 +957,8 @@ def self.udp_server_sockets(host=nil, port) # def self.udp_server_recv(sockets) sockets.each {|r| - begin - msg, sender_addrinfo, _, *controls = r.recvmsg_nonblock - rescue IO::WaitReadable - next - end + msg, sender_addrinfo, _, *controls = r.recvmsg_nonblock(exception: false) + next if msg == :wait_readable ai = r.local_address if ai.ipv6? and pktinfo = controls.find {|c| c.cmsg_is?(:IPV6, :PKTINFO) } ai = Addrinfo.udp(pktinfo.ipv6_pktinfo_addr.ip_address, ai.ip_port)