summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-16 04:07:31 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-16 04:07:31 +0000
commit8801fecb82fec5eb731a4ef7987d6145cecd60eb (patch)
tree9fa36bf05d6b89fc48c3f3abae6610932b384a42 /thread.c
parent575e4dfcbb133ed122bfac1f678dc6510e5769e2 (diff)
merges r21592 from trunk into ruby_1_9_1.
* thread.c (thread_start_func_2): call ruby_cleanup() if thread is main thread. [ruby-dev:37624] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/thread.c b/thread.c
index 6459ba7a0c..7acf191ffb 100644
--- a/thread.c
+++ b/thread.c
@@ -463,7 +463,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
}
thread_cleanup_func(th);
if (th->vm->main_thread == th) {
- rb_thread_stop_timer_thread();
+ ruby_cleanup(state);
}
native_mutex_unlock(&th->vm->global_vm_lock);