diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | thread_pthread.c | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sat Nov 8 01:42:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * thread_pthread.c (native_cond_timedwait): returns error code. + + * thread_pthread.c (thread_timer): typo fixed. + Sat Nov 8 01:14:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * thread_pthread.c (thread_timer, rb_thread_create_timer_thread): diff --git a/thread_pthread.c b/thread_pthread.c index 67ad3b08a4..46a86192e1 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -116,10 +116,10 @@ native_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) pthread_cond_wait(cond, mutex); } -static void +static int native_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *ts) { - pthread_cond_timedwait(cond, mutex, ts); + return pthread_cond_timedwait(cond, mutex, ts); } @@ -680,8 +680,8 @@ thread_timer(void *dummy) native_mutex_lock(&timer_thread_lock); native_cond_signal(&timer_thread_cond); -#define WAIT_FOR_10MS() native_cond_timedwait(&timer_thread_cond, &timer_thread_lock, get_ts(&ts, PER_NANO/100) - while ((err = WAIT_FOR_10MS()) != 0) { +#define WAIT_FOR_10MS() native_cond_timedwait(&timer_thread_cond, &timer_thread_lock, get_ts(&ts, PER_NANO/100)) + while ((err = WAIT_FOR_10MS()) != 0 && err != EINTR) { if (err != ETIMEDOUT) { rb_bug("thread_timer/timedwait: %d", err); } |