From 27f25728e69274fd226007bd6765d3819b0449c7 Mon Sep 17 00:00:00 2001 From: kosaki Date: Sun, 10 Mar 2013 03:59:29 +0000 Subject: [PATCH] * thread_pthread.c (timer_thread_sleep): use poll() instead of select(). select doesn't work if timer_thread_pipe[0] is greater than FD_SETSIZE. * thread_pthread.c (USE_SLEEPY_TIMER_THREAD): add a dependency against poll. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39681 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ thread_pthread.c | 21 ++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45ce41d805..44b58bfc36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Mar 6 21:31:35 2013 KOSAKI Motohiro + + * thread_pthread.c (timer_thread_sleep): use poll() instead of + select(). select doesn't work if timer_thread_pipe[0] is + greater than FD_SETSIZE. + * thread_pthread.c (USE_SLEEPY_TIMER_THREAD): add a dependency + against poll. + Wed Mar 6 21:00:23 2013 KOSAKI Motohiro * thread_pthread.c (USE_SLEEPY_TIMER_THREAD): use more accurate diff --git a/thread_pthread.c b/thread_pthread.c index 1faf2755a7..cd0aef7095 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -30,6 +30,9 @@ #if defined(__native_client__) && defined(NACL_NEWLIB) # include "nacl/select.h" #endif +#if HAVE_POLL +#include +#endif static void native_mutex_lock(pthread_mutex_t *lock); static void native_mutex_unlock(pthread_mutex_t *lock); @@ -53,11 +56,10 @@ static pthread_t timer_thread_id; #define USE_MONOTONIC_COND 0 #endif -#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) && defined(O_NONBLOCK) && !defined(__native_client__) +#if defined(HAVE_POLL) && defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) && defined(O_NONBLOCK) && !defined(__native_client__) /* The timer thread sleeps while only one Ruby thread is running. */ # define USE_SLEEPY_TIMER_THREAD 1 #else -/* Doesn't have select(1). */ # define USE_SLEEPY_TIMER_THREAD 0 #endif @@ -1218,23 +1220,20 @@ timer_thread_sleep(rb_global_vm_lock_t* gvl) { int result; int need_polling; - struct timeval timeout; - fd_set rfds; - FD_ZERO(&rfds); - FD_SET(timer_thread_pipe[0], &rfds); + struct pollfd pollfd; + + pollfd.fd = timer_thread_pipe[0]; + pollfd.events = POLLIN; need_polling = check_signal_thread_list(); if (gvl->waiting > 0 || need_polling) { - timeout.tv_sec = 0; - timeout.tv_usec = TIME_QUANTUM_USEC; - /* polling (TIME_QUANTUM_USEC usec) */ - result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, &timeout); + result = poll(&pollfd, 1, TIME_QUANTUM_USEC/1000); } else { /* wait (infinite) */ - result = select(timer_thread_pipe[0] + 1, &rfds, 0, 0, 0); + result = poll(&pollfd, 1, -1); } if (result == 0) {