diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 15:57:52 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-21 15:57:52 +0000 |
| commit | 9cfe35ad503cd6bb598dea85517949b932719afe (patch) | |
| tree | 00b50c4b264d237624d19632bc9b086feaeac4a8 /ext/socket | |
| parent | 6adda0379c0dc2b2f881060cba2ad40493e59608 (diff) | |
* io.c (io_getpartial): error message describes what should be
waited after nonblocking error.
(rb_io_write_nonblock): ditto.
* ext/socket/init.c (s_recvfrom_nonblock): ditto.
(s_accept_nonblock): ditto.
* ext/socket/socket.c (sock_connect_nonblock): ditto.
* ext/socket/ancdata.c (bsock_sendmsg_internal): ditto.
(bsock_recvmsg_internal): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/ancdata.c | 10 | ||||
| -rw-r--r-- | ext/socket/init.c | 4 | ||||
| -rw-r--r-- | ext/socket/socket.c | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index e88829db9b..f7763e90a0 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1030,8 +1030,11 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) goto retry; } - if (ss == -1) + if (ss == -1) { + if (nonblock && errno == EWOULDBLOCK) + rb_sys_fail("sendmsg(2) WANT_WRITE"); rb_sys_fail("sendmsg(2)"); + } return SSIZET2NUM(ss); } @@ -1290,8 +1293,11 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) goto retry; } - if (ss == -1) + if (ss == -1) { + if (nonblock && errno == EWOULDBLOCK) + rb_sys_fail("recvmsg(2) WANT_READ"); rb_sys_fail("recvmsg(2)"); + } if (grow_buffer) { int grown = 0; diff --git a/ext/socket/init.c b/ext/socket/init.c index 4665e3e49a..5cf0cbd85c 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -192,6 +192,8 @@ s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from) slen = recvfrom(fd, RSTRING_PTR(str), buflen, flags, (struct sockaddr*)&buf, &alen); if (slen < 0) { + if (errno == EWOULDBLOCK) + rb_sys_fail("recvfrom(2) WANT_READ"); rb_sys_fail("recvfrom(2)"); } if (slen < RSTRING_LEN(str)) { @@ -453,6 +455,8 @@ s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen rb_io_set_nonblock(fptr); fd2 = accept(fptr->fd, (struct sockaddr*)sockaddr, len); if (fd2 < 0) { + if (errno == EWOULDBLOCK || errno == ECONNABORTED || errno == EPROTO) + rb_sys_fail("accept(2) WANT_READ"); rb_sys_fail("accept(2)"); } make_fd_nonblock(fd2); diff --git a/ext/socket/socket.c b/ext/socket/socket.c index ce7bf9995f..8c92301bd9 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -311,6 +311,8 @@ sock_connect_nonblock(VALUE sock, VALUE addr) rb_io_set_nonblock(fptr); n = connect(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LEN(addr)); if (n < 0) { + if (errno == EINPROGRESS) + rb_sys_fail("connect(2) WANT_WRITE"); rb_sys_fail("connect(2)"); } |