summaryrefslogtreecommitdiff
path: root/thread_win32.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-02 03:58:25 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-02 03:58:25 +0000
commit9ee5e613b596202d719c22fadd700da2d8fd3a55 (patch)
tree42ad406ac6ac2b5063425f41be3fb2095c90c6f0 /thread_win32.c
parent7539e11a7f742e11fdfe051798cf07b951384df9 (diff)
* 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_win32.c')
-rw-r--r--thread_win32.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/thread_win32.c b/thread_win32.c
index f404a4f..139b94a 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -564,10 +564,21 @@ native_stop_timer_thread(void)
{
int stopped = --system_working <= 0;
if (stopped) {
+ SetEvent(timer_thread_lock);
+ native_thread_join(timer_thread_id);
CloseHandle(timer_thread_lock);
timer_thread_lock = 0;
}
return stopped;
}
+static void
+native_reset_timer_thread(void)
+{
+ if (timer_thread_id) {
+ CloseHandle(timer_thread_id);
+ timer_thread_id = 0;
+ }
+}
+
#endif /* THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION */