mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
aaf2d070a8
This is analogous to functionality found in IO#read_nonblock and IO#wait_nonblock. Raising exceptions for common failures on non-blocking servers is expensive and makes $DEBUG too noisy. Benchmark results: user system total real default 2.790000 0.870000 3.660000 ( 3.671597) exception: false 1.120000 0.800000 1.920000 ( 1.922032) exception: false (cached arg) 0.820000 0.770000 1.590000 ( 1.589267) --------------------- benchmark script ------------------------ require 'socket' require 'benchmark' require 'tmpdir' nr = 1000000 Dir.mktmpdir('nb_bench') do |path| sock_path = "#{path}/test.sock" s = UNIXServer.new(sock_path) Benchmark.bmbm do |x| x.report("default") do nr.times do begin s.accept_nonblock rescue IO::WaitReadable end end end x.report("exception: false") do nr.times do begin s.accept_nonblock(exception: false) rescue IO::WaitReadable abort "should not raise" end end end x.report("exception: false (cached arg)") do arg = { exception: false } nr.times do begin s.accept_nonblock(arg) rescue IO::WaitReadable abort "should not raise" end end end end end * ext/socket/init.c (rsock_s_accept_nonblock): support exception: false [ruby-core:66385] [Feature #10532] * ext/socket/init.c (rsock_init_socket_init): define new symbols * ext/socket/rubysocket.h: adjust prototype * ext/socket/socket.c (sock_accept_nonblock): support exception: false * ext/openssl/ossl_ssl.c (ossl_ssl_accept_nonblock): ditto * ext/socket/socket.c (Init_socket): adjust accept_nonblock definition * ext/openssl/ossl_ssl.c (Init_ossl_ssl): ditto * ext/socket/tcpserver.c (rsock_init_tcpserver): ditto * ext/socket/unixserver.c (rsock_init_unixserver): ditto * ext/socket/tcpserver.c (tcp_accept_nonblock): adjust rsock_s_accept_nonblock call * ext/socket/unixserver.c (unix_accept_nonblock): ditto * ext/openssl/ossl_ssl.c (ossl_start_ssl): support no_exception * ext/openssl/ossl_ssl.c (ossl_ssl_connect): adjust ossl_start_ssl call * ext/openssl/ossl_ssl.c (ossl_ssl_connect_nonblock): ditto * ext/openssl/ossl_ssl.c (ossl_ssl_accept): ditto * test/socket/test_nonblock.rb (test_accept_nonblock): test for "exception :false" * test/socket/test_tcp.rb (test_accept_nonblock): new test * test/socket/test_unix.rb (test_accept_nonblock): ditto * test/openssl/test_pair.rb (test_accept_nonblock_no_exception): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
159 lines
4 KiB
C
159 lines
4 KiB
C
/************************************************
|
|
|
|
unixserver.c -
|
|
|
|
created at: Thu Mar 31 12:21:29 JST 1994
|
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
|
|
|
************************************************/
|
|
|
|
#include "rubysocket.h"
|
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
/*
|
|
* call-seq:
|
|
* UNIXServer.new(path) => unixserver
|
|
*
|
|
* Creates a new UNIX server socket bound to _path_.
|
|
*
|
|
* serv = UNIXServer.new("/tmp/sock")
|
|
* s = serv.accept
|
|
* p s.read
|
|
*/
|
|
static VALUE
|
|
unix_svr_init(VALUE sock, VALUE path)
|
|
{
|
|
return rsock_init_unixsock(sock, path, 1);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* unixserver.accept => unixsocket
|
|
*
|
|
* Accepts an incoming connection.
|
|
* It returns a new UNIXSocket object.
|
|
*
|
|
* UNIXServer.open("/tmp/sock") {|serv|
|
|
* UNIXSocket.open("/tmp/sock") {|c|
|
|
* s = serv.accept
|
|
* s.puts "hi"
|
|
* s.close
|
|
* p c.read #=> "hi\n"
|
|
* }
|
|
* }
|
|
*
|
|
*/
|
|
static VALUE
|
|
unix_accept(VALUE sock)
|
|
{
|
|
rb_io_t *fptr;
|
|
struct sockaddr_un from;
|
|
socklen_t fromlen;
|
|
|
|
GetOpenFile(sock, fptr);
|
|
fromlen = (socklen_t)sizeof(struct sockaddr_un);
|
|
return rsock_s_accept(rb_cUNIXSocket, fptr->fd,
|
|
(struct sockaddr*)&from, &fromlen);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* unixserver.accept_nonblock([options]) => unixsocket
|
|
*
|
|
* Accepts an incoming connection using accept(2) after
|
|
* O_NONBLOCK is set for the underlying file descriptor.
|
|
* It returns an accepted UNIXSocket for the incoming connection.
|
|
*
|
|
* === Example
|
|
* require 'socket'
|
|
* serv = UNIXServer.new("/tmp/sock")
|
|
* begin # emulate blocking accept
|
|
* sock = serv.accept_nonblock
|
|
* rescue IO::WaitReadable, Errno::EINTR
|
|
* IO.select([serv])
|
|
* retry
|
|
* end
|
|
* # sock is an accepted socket.
|
|
*
|
|
* Refer to Socket#accept for the exceptions that may be thrown if the call
|
|
* to UNIXServer#accept_nonblock fails.
|
|
*
|
|
* UNIXServer#accept_nonblock may raise any error corresponding to accept(2) failure,
|
|
* including Errno::EWOULDBLOCK.
|
|
*
|
|
* If the exception is Errno::EWOULDBLOCK, Errno::AGAIN, Errno::ECONNABORTED or Errno::EPROTO,
|
|
* it is extended by IO::WaitReadable.
|
|
* So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
|
|
*
|
|
* By specifying `exception: false`, the options hash allows you to indicate
|
|
* that accept_nonblock should not raise an IO::WaitReadable exception, but
|
|
* return the symbol :wait_readable instead.
|
|
*
|
|
* === See
|
|
* * UNIXServer#accept
|
|
* * Socket#accept
|
|
*/
|
|
static VALUE
|
|
unix_accept_nonblock(int argc, VALUE *argv, VALUE sock)
|
|
{
|
|
rb_io_t *fptr;
|
|
struct sockaddr_un from;
|
|
socklen_t fromlen;
|
|
|
|
GetOpenFile(sock, fptr);
|
|
fromlen = (socklen_t)sizeof(from);
|
|
return rsock_s_accept_nonblock(argc, argv, rb_cUNIXSocket, fptr,
|
|
(struct sockaddr *)&from, &fromlen);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* unixserver.sysaccept => file_descriptor
|
|
*
|
|
* Accepts a new connection.
|
|
* It returns the new file descriptor which is an integer.
|
|
*
|
|
* UNIXServer.open("/tmp/sock") {|serv|
|
|
* UNIXSocket.open("/tmp/sock") {|c|
|
|
* fd = serv.sysaccept
|
|
* s = IO.new(fd)
|
|
* s.puts "hi"
|
|
* s.close
|
|
* p c.read #=> "hi\n"
|
|
* }
|
|
* }
|
|
*
|
|
*/
|
|
static VALUE
|
|
unix_sysaccept(VALUE sock)
|
|
{
|
|
rb_io_t *fptr;
|
|
struct sockaddr_un from;
|
|
socklen_t fromlen;
|
|
|
|
GetOpenFile(sock, fptr);
|
|
fromlen = (socklen_t)sizeof(struct sockaddr_un);
|
|
return rsock_s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
|
|
}
|
|
|
|
#endif
|
|
|
|
void
|
|
rsock_init_unixserver(void)
|
|
{
|
|
#ifdef HAVE_SYS_UN_H
|
|
/*
|
|
* Document-class: UNIXServer < UNIXSocket
|
|
*
|
|
* UNIXServer represents a UNIX domain stream server socket.
|
|
*
|
|
*/
|
|
rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket);
|
|
rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
|
|
rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
|
|
rb_define_method(rb_cUNIXServer, "accept_nonblock", unix_accept_nonblock, -1);
|
|
rb_define_method(rb_cUNIXServer, "sysaccept", unix_sysaccept, 0);
|
|
rb_define_method(rb_cUNIXServer, "listen", rsock_sock_listen, 1); /* in socket.c */
|
|
#endif
|
|
}
|