kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/socket/socket.c (ruby_connect, s_accept): came back blocking

Browse source 
region because other thread/process maybe read/write the socket
	  between select() and connect()/accept().



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-07-15 12:34:58 +00:00
parent 6bc480e059
commit c9eba6932b
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ext/socket/socket.c
View file

@ -1142,16 +1142,18 @@ struct connect_arg {
socklen_t len; socklen_t len;
}; };
static int static VALUE
connect0(struct connect_arg *arg) connect_blocking(void *data)
{ {
struct connect_arg *arg = data;
return connect(arg->fd, arg->sockaddr, arg->len); return connect(arg->fd, arg->sockaddr, arg->len);
} }
#if defined(SOCKS) && !defined(SOCKS5) #if defined(SOCKS) && !defined(SOCKS5)
static int static VALUE
socks_connect0(struct connect_arg *arg) socks_connect_blocking(void *data)
{ {
struct connect_arg *arg = data;
return Rconnect(arg->fd, arg->sockaddr, arg->len); return Rconnect(arg->fd, arg->sockaddr, arg->len);
} }
#endif #endif
@ -1160,7 +1162,7 @@ static int
ruby_connect(int fd, const struct sockaddr *sockaddr, int len, int socks) ruby_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
{ {
int status; int status;
int (*func)(struct connect_arg *) = connect0; rb_blocking_function_t *func = connect_blocking;
struct connect_arg arg; struct connect_arg arg;
#if WAIT_IN_PROGRESS > 0 #if WAIT_IN_PROGRESS > 0
int wait_in_progress = -1; int wait_in_progress = -1;
@ -1172,11 +1174,11 @@ ruby_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
arg.sockaddr = sockaddr; arg.sockaddr = sockaddr;
arg.len = len; arg.len = len;
#if defined(SOCKS) && !defined(SOCKS5) #if defined(SOCKS) && !defined(SOCKS5)
if (socks) func = socks_connect0; if (socks) func = socks_connect_blocking;
#endif #endif
for (;;) { for (;;) {
rb_thread_fd_writable(fd); rb_thread_fd_writable(fd);
status = func(&arg); status = BLOCKING_REGION(func, &arg);
if (status < 0) { if (status < 0) {
switch (errno) { switch (errno) {
case EAGAIN: case EAGAIN:
@ -1526,16 +1528,33 @@ s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen
return init_sock(rb_obj_alloc(klass), fd2); return init_sock(rb_obj_alloc(klass), fd2);
} }
struct accept_arg {
int fd;
struct sockaddr *sockaddr;
socklen_t *len;
};
static VALUE
accept_blocking(void *data)
{
struct accept_arg *arg = data;
return (VALUE)accept(arg->fd, arg->sockaddr, arg->len);
}
static VALUE static VALUE
s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len) s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
{ {
int fd2; int fd2;
int retry = 0; int retry = 0;
struct accept_arg arg;
rb_secure(3); rb_secure(3);
arg.fd = fd;
arg.sockaddr = sockaddr;
arg.len = len;
retry: retry:
rb_thread_wait_fd(fd); rb_thread_wait_fd(fd);
fd2 = accept(fd, sockaddr, len); fd2 = BLOCKING_REGION(accept_blocking, &arg);
if (fd2 < 0) { if (fd2 < 0) {
switch (errno) { switch (errno) {
case EMFILE: case EMFILE: