From c98f39af775058dfc39e9f14fb0557e887efbba5 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 11 Mar 2013 15:51:44 +0000 Subject: merge revision(s) 39680,39681: [Backport #8063] * thread_pthread.c (USE_SLEEPY_TIMER_THREAD): use more accurate ifdef condtions. * 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/branches/ruby_2_0_0@39726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 13 +++++++++++++ thread_pthread.c | 25 ++++++++++++------------- version.h | 6 +++--- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65410e9c75..1cc4fb54c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Tue Mar 12 00:51:23 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. + +Tue Mar 12 00:51:23 2013 KOSAKI Motohiro + + * thread_pthread.c (USE_SLEEPY_TIMER_THREAD): use more accurate + ifdef condtions. + Mon Mar 11 01:16:12 2013 Nobuyoshi Nakada * configure.in (unexpand_shvar): get rid of non-portable shell diff --git a/thread_pthread.c b/thread_pthread.c index 6e5f53fa67..7adc229c42 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,12 +56,11 @@ static pthread_t timer_thread_id; #define USE_MONOTONIC_COND 0 #endif -#ifdef __native_client__ -/* Doesn't have select(1). */ -# define USE_SLEEPY_TIMER_THREAD 0 -#else +#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 +# define USE_SLEEPY_TIMER_THREAD 0 #endif static void @@ -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) { diff --git a/version.h b/version.h index c9640e8e7a..09ba49e67e 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-03-11" -#define RUBY_PATCHLEVEL 54 +#define RUBY_RELEASE_DATE "2013-03-12" +#define RUBY_PATCHLEVEL 55 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" -- cgit v1.2.3