* 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

1 files changed, 7 insertions, 0 deletions

diff --git a/thread_pthread.c b/thread_pthread.c
index a4e7f25d75..e3ff6ee714 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -816,9 +816,16 @@ native_stop_timer_thread(void)
 	native_cond_signal(&timer_thread_cond);
     }
     native_mutex_unlock(&timer_thread_lock);
+    native_thread_join(timer_thread_id);
     return stopped;
 }
 
+static void
+native_reset_timer_thread(void)
+{
+    timer_thread_id = 0;
+}
+
 #ifdef HAVE_SIGALTSTACK
 int
 ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr)