Permalink
Browse files

* 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
  • Loading branch information...
1 parent 7539e11 commit 9ee5e613b596202d719c22fadd700da2d8fd3a55 @unak unak committed Nov 2, 2009
Showing with 30 additions and 3 deletions.
  1. +10 −0 ChangeLog
  2. +2 −3 thread.c
  3. +7 −0 thread_pthread.c
  4. +11 −0 thread_win32.c
View
@@ -1,3 +1,13 @@
+Mon Nov 2 12:55:50 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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.
+
Mon Nov 2 11:22:19 2009 NARUSE, Yui <naruse@ruby-lang.org>
* ext/dl/win32/lib/win32/registry.rb: update rdoc. [ruby-core:26022]
View
@@ -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
View
@@ -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)
View
@@ -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 */

0 comments on commit 9ee5e61

Please sign in to comment.