From 06dcf7840fd6a9f7f6ad48ff9ce9d0bbe180c1eb Mon Sep 17 00:00:00 2001 From: kosaki Date: Tue, 18 Dec 2012 10:07:15 +0000 Subject: * io.c (rb_io_wait_writable): don't use rb_thread_wait_fd() because it is for waiting until io readable. * io.c (rb_io_wait_writable): always use rb_thread_fd_writable() instaed of bare rb_wait_for_single_fd(). we shouldn't ignore return value. * io.c (rb_io_wait_readable): ditto. always use rb_thread_wait_fd(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index 3047da4380..25680cf83e 100644 --- a/io.c +++ b/io.c @@ -1050,14 +1050,11 @@ rb_io_wait_readable(int f) #if defined(ERESTART) case ERESTART: #endif - rb_thread_wait_fd(f); - return TRUE; - case EAGAIN: #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN case EWOULDBLOCK: #endif - rb_wait_for_single_fd(f, RB_WAITFD_IN, NULL); + rb_thread_wait_fd(f); return TRUE; default: @@ -1076,14 +1073,11 @@ rb_io_wait_writable(int f) #if defined(ERESTART) case ERESTART: #endif - rb_thread_wait_fd(f); - return TRUE; - case EAGAIN: #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN case EWOULDBLOCK: #endif - rb_wait_for_single_fd(f, RB_WAITFD_OUT, NULL); + rb_thread_fd_writable(f); return TRUE; default: -- cgit v1.2.3