diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 10:40:57 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 10:40:57 +0000 |
commit | 0a7e7ec7f5c32407cfbd978ffe3d7b04dbe94693 (patch) | |
tree | aaee0a952f495a155ac7fd94e75e81e3d8269d60 /thread.c | |
parent | cca906e87b944c16a0e4030925a2f4f843d9a077 (diff) | |
download | ruby-0a7e7ec7f5c32407cfbd978ffe3d7b04dbe94693.tar.gz ruby-0a7e7ec7f5c32407cfbd978ffe3d7b04dbe94693.tar.xz ruby-0a7e7ec7f5c32407cfbd978ffe3d7b04dbe94693.zip |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@21097 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; |