From 409033efcac2d6d81b228b12e335bc75f7ae16a1 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 2 Nov 2009 05:45:35 +0000 Subject: [PATCH] * thread_pthread.c (native_stop_timer_thread): delay joinning timer thread after unlocking mutex. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread_pthread.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d117279396..bb05a7ae8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 2 14:43:48 2009 NAKAMURA Usaku + + * thread_pthread.c (native_stop_timer_thread): delay joinning timer + thread after unlocking mutex. + Mon Nov 2 13:31:14 2009 NAKAMURA Usaku * thread_pthread.c (native_stop_timer_thread): need to join timer thread diff --git a/thread_pthread.c b/thread_pthread.c index e82777d68e..2273d2062c 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -814,9 +814,11 @@ 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); + if (stopped) { + native_thread_join(timer_thread_id); + } return stopped; }