diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-07 16:42:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-07 16:42:31 +0000 |
commit | 006be2d79020f3ad6f4ba644e35d0cec1d8d42fd (patch) | |
tree | 7e86f829b97ddf3a530354d4d2a76d8da8ba5ed1 /thread_pthread.c | |
parent | 1ebc4f605709b76e2364eed6757975d841e229e4 (diff) | |
download | ruby-006be2d79020f3ad6f4ba644e35d0cec1d8d42fd.tar.gz |
* thread_pthread.c (native_cond_timedwait): returns error code.
* thread_pthread.c (thread_timer): typo fixed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
-rw-r--r-- | thread_pthread.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); } |