diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 06:15:14 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 06:15:14 +0000 |
| commit | 17e8f185ded0d4f319ac835a08aaf6b2dabcffe4 (patch) | |
| tree | 315810a57a49d34f16895010d5729059c8b9d2cb /thread_pthread.c | |
| parent | 0f8d7fd51a6b9e2a477844a5b9a859652fcf9564 (diff) | |
merges r21265 from trunk into ruby_1_9_1.
* signal.c (rb_signal_buff_size): defined for check whether signal
is in the buffer or not.
* thread_pthread.c (thread_timer): don't exit the loop when signal
is in the buffer. [ruby-dev:37637]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
| -rw-r--r-- | thread_pthread.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index a23e7727db..72f8a2f288 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -741,19 +741,24 @@ get_ts(struct timespec *ts, unsigned long nsec) return ts; } +int rb_signal_buff_size(void); + static void * thread_timer(void *dummy) { struct timespec ts; - int err; native_mutex_lock(&timer_thread_lock); native_cond_broadcast(&timer_thread_cond); #define WAIT_FOR_10MS() native_cond_timedwait(&timer_thread_cond, &timer_thread_lock, get_ts(&ts, PER_NANO/100)) - while (system_working > 0 && (err = WAIT_FOR_10MS()) != 0 && err != EINTR) { - if (err != ETIMEDOUT) { - rb_bug("thread_timer/timedwait: %d", err); + while (system_working > 0) { + int err = WAIT_FOR_10MS(); + if (err == ETIMEDOUT); + else if (err == 0 || err == EINTR) { + if (rb_signal_buff_size() == 0) break; } + else rb_bug("thread_timer/timedwait: %d", err); + #ifndef __CYGWIN__ if (signal_thread_list_anchor.next) { FGLOCK(&signal_thread_list_lock, { |