diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | thread_pthread.c | 13 |
2 files changed, 21 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Tue Jul 5 01:30:01 2011 Yusuke Endoh <mame@tsg.ne.jp> + + * thread_pthread.c (native_sleep): cut the waiting time up to + 100,000,000 because Solaris cond_timedwait() return EINVAL if an + argument is greater than current_time + 100,000,000. This is + considered as a kind of spurious wakeup. The caller to native_sleep + should care about spurious wakeup. + Tue Jul 5 01:24:26 2011 Yusuke Endoh <mame@tsg.ne.jp> * cont.c: disable FIBER_USE_NATIVE on Solaris because resuming any diff --git a/thread_pthread.c b/thread_pthread.c index 41d6399c3c..9748526140 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -857,6 +857,19 @@ native_sleep(rb_thread_t *th, struct timeval *timeout_tv) timeout_rel.tv_sec = timeout_tv->tv_sec; timeout_rel.tv_nsec = timeout_tv->tv_usec * 1000; + /* Solaris cond_timedwait() return EINVAL if an argument is greater than + * current_time + 100,000,000. So cut up to 100,000,000. This is + * considered as a kind of spurious wakeup. The caller to native_sleep + * should care about spurious wakeup. + * + * See also [Bug #1341] [ruby-core:29702] + * http://download.oracle.com/docs/cd/E19683-01/816-0216/6m6ngupgv/index.html + */ + if (timeout_rel.tv_sec > 100000000) { + timeout_rel.tv_sec = 100000000; + timeout_rel.tv_nsec = 0; + } + timeout = native_cond_timeout(cond, timeout_rel); } |