kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* process.c (after_exec): needs to reset before restart timer

Browse source 
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/trunk@21097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-12-27 10:40:57 +00:00
parent b5d2750bbc
commit a94adfa245
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,4 +1,10 @@
Sat Dec 27 19:30:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sat Dec 27 19:40:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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]
* thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): DRY.

2
process.c
View file

@ -976,7 +976,7 @@ static int forked_child = 0;
#define before_exec() \
(rb_enable_interrupt(), forked_child ? 0 : rb_thread_stop_timer_thread())
#define after_exec() \
(rb_thread_start_timer_thread(), forked_child = 0, rb_disable_interrupt())
(rb_thread_reset_timer_thread(), rb_thread_start_timer_thread(), forked_child = 0, rb_disable_interrupt())
#define before_fork() before_exec()
#define after_fork() (GET_THREAD()->thrown_errinfo = 0, after_exec())

3
thread.c
View file

@ -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;