diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-02 03:58:25 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-02 03:58:25 +0000 |
commit | 9ee5e613b596202d719c22fadd700da2d8fd3a55 (patch) | |
tree | 42ad406ac6ac2b5063425f41be3fb2095c90c6f0 /thread.c | |
parent | 7539e11a7f742e11fdfe051798cf07b951384df9 (diff) | |
download | ruby-9ee5e613b596202d719c22fadd700da2d8fd3a55.tar.gz |
* thread_{pthread,win32}.c (native_stop_timer_thread): join the thread
here.
* thread_{pthread,win32}.c (native_reset_timer_thread): new function.
* thread.c (rb_thread_stop_timer_thread, rb_thread_reset_timer_thread):
call above function instead of simply seting 0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -2651,15 +2651,14 @@ void rb_thread_stop_timer_thread(void) { if (timer_thread_id && native_stop_timer_thread()) { - native_thread_join(timer_thread_id); - timer_thread_id = 0; + native_reset_timer_thread(); } } void rb_thread_reset_timer_thread(void) { - timer_thread_id = 0; + native_reset_timer_thread(); } void |