diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:01 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:01 +0000 |
commit | a929fd040a7dff2ab7739ad5e1389db4c2c2ec12 (patch) | |
tree | 0d1cd7745506d11538289ba3bfe86f262617f77f /thread.c | |
parent | 6a0e4079f3a46d5bbd7b5756396bf3479570fae9 (diff) |
merges r21097 from trunk into ruby_1_9_1.
* process.c (after_exec): needs to reset before restart timer
thread.
* thread.c (thread_start_func_2): stops timer thread if forked in
the new thread. [ruby-core:19385]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -462,6 +462,9 @@ 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(); + } native_mutex_unlock(&th->vm->global_vm_lock); return 0; |