summaryrefslogtreecommitdiff
path: root/thread_pthread.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-02 04:32:28 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-02 04:32:28 +0000
commit12fadc102208853bd291d063204fdc2a1fcc0c40 (patch)
tree09822082ae641952c78b5ecb19e161b1066d24a8 /thread_pthread.c
parent9ee5e613b596202d719c22fadd700da2d8fd3a55 (diff)
* thread_pthread.c (native_stop_timer_thread): need to join timer thread
only when really stopping it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
-rw-r--r--thread_pthread.c2
1 files changed, 1 insertions, 1 deletions
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;
}