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 | 1927b35e4c52f8f6d1255b89c4b98df9cfcbbebb (patch) | |
| tree | 42ad406ac6ac2b5063425f41be3fb2095c90c6f0 /thread_pthread.c | |
| parent | 669e0f35d3ba6af1091bde73fca83ac522abc93b (diff) | |
| download | ruby-1927b35e4c52f8f6d1255b89c4b98df9cfcbbebb.tar.gz ruby-1927b35e4c52f8f6d1255b89c4b98df9cfcbbebb.tar.xz ruby-1927b35e4c52f8f6d1255b89c4b98df9cfcbbebb.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@25627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
| -rw-r--r-- | thread_pthread.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index a4e7f25d7..e3ff6ee71 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) |