diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-02 04:32:28 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-02 04:32:28 +0000 |
commit | f295f29160bd6d43e91c95406f30e46cf280ee26 (patch) | |
tree | 09822082ae641952c78b5ecb19e161b1066d24a8 | |
parent | 1927b35e4c52f8f6d1255b89c4b98df9cfcbbebb (diff) | |
download | ruby-f295f29160bd6d43e91c95406f30e46cf280ee26.tar.gz ruby-f295f29160bd6d43e91c95406f30e46cf280ee26.tar.xz ruby-f295f29160bd6d43e91c95406f30e46cf280ee26.zip |
* thread_pthread.c (native_stop_timer_thread): need to join timer thread
only when really stopping it.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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 e3ff6ee71..e82777d68 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; } |