1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
nobu 2008-11-07 16:42:31 +00:00
parent 1ebc4f6057
commit 006be2d790
2 changed files with 10 additions and 4 deletions

View file

@ -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):

View file

@ -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);
}