summaryrefslogtreecommitdiff
path: root/ext/socket/unixsocket.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-13 14:11:23 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-13 14:11:23 +0000
commit9778737d7b2a870ff195f318cceb48b93e661f03 (patch)
tree228992023e01b07a1ccd6a060c7a885e52def2ba /ext/socket/unixsocket.c
parent3254c1bf24207b0c155e8e0b9427cf9709c8c8ca (diff)
* ext/socket/unixsocket.c (unix_send_io): race condition fixed.
(unix_recv_io): ditto. fixed by Eric Wong. [ruby-core:35574] * test/socket/test_unix.rb: test added for above problem. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/unixsocket.c')
-rw-r--r--ext/socket/unixsocket.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c
index 5a8641a..88ffa60 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -248,9 +248,10 @@ unix_send_io(VALUE sock, VALUE val)
#endif
arg.fd = fptr->fd;
- rb_thread_fd_writable(arg.fd);
- if ((int)BLOCKING_REGION_FD(sendmsg_blocking, &arg) == -1)
- rb_sys_fail("sendmsg(2)");
+ while ((int)BLOCKING_REGION_FD(sendmsg_blocking, &arg) == -1) {
+ if (!rb_io_wait_writable(arg.fd))
+ rb_sys_fail("sendmsg(2)");
+ }
return Qnil;
}
@@ -334,9 +335,10 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
#endif
arg.fd = fptr->fd;
- rb_thread_wait_fd(arg.fd);
- if ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1)
- rb_sys_fail("recvmsg(2)");
+ while ((int)BLOCKING_REGION_FD(recvmsg_blocking, &arg) == -1) {
+ if (!rb_io_wait_readable(arg.fd))
+ rb_sys_fail("recvmsg(2)");
+ }
#if FD_PASSING_BY_MSG_CONTROL
if (arg.msg.msg_controllen < (socklen_t)sizeof(struct cmsghdr)) {