diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | signal.c | 6 | ||||
| -rw-r--r-- | thread_pthread.c | 13 |
3 files changed, 27 insertions, 8 deletions
@@ -1,3 +1,11 @@ +Fri Jan 2 06:43:58 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * 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] + Thu Jan 1 22:27:55 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp> * spec/default.mspec: fix for builddir != srcdir @@ -712,11 +720,11 @@ Tue Dec 23 08:04:58 2008 Eric Hodel <drbrain@segment7.net> Wed Dec 24 20:15:50 2008 Koichi Sasada <ko1@atdot.net> - * tool/file2lastrev.rb (get_revisions): fix to ignore end of line. + * tool/file2lastrev.rb (get_revisions): fix to ignore end of line. Tue Dec 23 15:48:55 2008 NAKAMURA Usaku <usa@ruby-lang.org> - * tool/file2lastrev.rb: shouldn't use single quote in shell's command + * tool/file2lastrev.rb: shouldn't use single quote in shell's command line if you want to support Windows. Tue Dec 23 15:36:58 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> @@ -1248,7 +1256,7 @@ Sat Dec 13 13:41:44 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * test/ruby/test_m17n_comb.rb: feature changed in r20626. follows it. - + Sat Dec 13 12:48:57 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> * test/ruby/test_m17n.rb: feature changed in r20626. @@ -2514,7 +2522,7 @@ Wed Oct 29 23:31:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Wed Oct 29 23:57:29 2008 Yusuke Endoh <mame@tsg.ne.jp> * array.c (rb_ary_sort_bang): replacing array during sort broke - invariant of array. [ruby-dev:36983] + invariant of array. [ruby-dev:36983] Wed Oct 29 21:06:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org> @@ -514,6 +514,12 @@ sighandler(int sig) #endif } +int +rb_signal_buff_size() +{ + return signal_buff.size; +} + #if USE_TRAP_MASK # ifdef HAVE_SIGPROCMASK static sigset_t trap_last_mask; 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, { |