From 368fdf9cc164caef3ea08cdd9226542de943479f Mon Sep 17 00:00:00 2001 From: kosaki Date: Sun, 10 Mar 2013 03:59:39 +0000 Subject: [PATCH] * thread_pthread.c (consume_communication_pipe): retry when read returned CCP_READ_BUFF_SIZE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread_pthread.c | 21 ++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44b58bfc36..a52c8bf5c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Mar 3 02:42:29 2013 KOSAKI Motohiro + + * thread_pthread.c (consume_communication_pipe): retry when + read returned CCP_READ_BUFF_SIZE. + Wed Mar 6 21:31:35 2013 KOSAKI Motohiro * thread_pthread.c (timer_thread_sleep): use poll() instead of diff --git a/thread_pthread.c b/thread_pthread.c index cd0aef7095..4ae7e2abe4 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1186,13 +1186,20 @@ consume_communication_pipe(void) static char buff[CCP_READ_BUFF_SIZE]; ssize_t result; - retry: - result = read(timer_thread_pipe[0], buff, CCP_READ_BUFF_SIZE); - if (result < 0) { - switch (errno) { - case EINTR: goto retry; - default: - rb_async_bug_errno("consume_communication_pipe: read\n", errno); + while (1) { + result = read(timer_thread_pipe[0], buff, sizeof(buff)); + if (result == 0) { + return; + } + else if (result < 0) { + switch (errno) { + case EINTR: + continue; /* retry */ + case EAGAIN: + return; + default: + rb_async_bug_errno("consume_communication_pipe: read\n", errno); + } } } }