diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | thread_pthread.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Nov 2 13:31:14 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * thread_pthread.c (native_stop_timer_thread): need to join timer thread + only when really stopping it. + Mon Nov 2 12:55:50 2009 NAKAMURA Usaku <usa@ruby-lang.org> * thread_{pthread,win32}.c (native_stop_timer_thread): join the thread diff --git a/thread_pthread.c b/thread_pthread.c index e3ff6ee714..e82777d68e 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -814,9 +814,9 @@ native_stop_timer_thread(void) stopped = --system_working <= 0; if (stopped) { native_cond_signal(&timer_thread_cond); + native_thread_join(timer_thread_id); } native_mutex_unlock(&timer_thread_lock); - native_thread_join(timer_thread_id); return stopped; } |