diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-10 01:41:59 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-10 01:41:59 +0000 |
commit | 91987f6b047afba7ffe4852539a15c214bdf56ba (patch) | |
tree | cc96c5a96123040b97e60d3b4cb01feedffaa263 /ext | |
parent | 7d59a9631405b68e7aec9dbcf5e513649b779ceb (diff) | |
download | ruby-91987f6b047afba7ffe4852539a15c214bdf56ba.tar.gz |
* ext/socket/{basicksocket,init,udpsocket}.c: revert some parts of
r36944. it breaks mswin/mingw ruby and brought into many many
crashes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/basicsocket.c | 3 | ||||
-rw-r--r-- | ext/socket/init.c | 2 | ||||
-rw-r--r-- | ext/socket/udpsocket.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c index 84ea2bb6bd..c1ae88d80c 100644 --- a/ext/socket/basicsocket.c +++ b/ext/socket/basicsocket.c @@ -558,7 +558,8 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock) GetOpenFile(sock, fptr); arg.fd = fptr->fd; arg.flags = NUM2INT(flags); - while ((n = (int)BLOCKING_REGION_FD(func, &arg)) < 0) { + while (rb_thread_fd_writable(arg.fd), + (n = (int)BLOCKING_REGION_FD(func, &arg)) < 0) { if (rb_io_wait_writable(arg.fd)) { continue; } diff --git a/ext/socket/init.c b/ext/socket/init.c index 3960a23300..696b62d82a 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -130,6 +130,7 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from) RBASIC(str)->klass = 0; while (rb_io_check_closed(fptr), + rb_thread_wait_fd(arg.fd), (slen = BLOCKING_REGION_FD(recvfrom_blocking, &arg)) < 0) { if (!rb_io_wait_readable(fptr->fd)) { rb_sys_fail("recvfrom(2)"); @@ -559,6 +560,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len) arg.sockaddr = sockaddr; arg.len = len; retry: + rb_thread_wait_fd(fd); fd2 = (int)BLOCKING_REGION_FD(accept_blocking, &arg); if (fd2 < 0) { switch (errno) { diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c index 1b8756a904..0ba4371f1a 100644 --- a/ext/socket/udpsocket.c +++ b/ext/socket/udpsocket.c @@ -176,6 +176,7 @@ udp_send(int argc, VALUE *argv, VALUE sock) retry: arg.to = res->ai_addr; arg.tolen = res->ai_addrlen; + rb_thread_fd_writable(arg.fd); n = (int)BLOCKING_REGION_FD(rsock_sendto_blocking, &arg); if (n >= 0) { freeaddrinfo(res0); |