From 837cd2c61968761bcdc4fc98a00f1484b5bef9d6 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 28 Dec 2008 09:42:01 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'process.c') diff --git a/process.c b/process.c index 6674b070c..584f00562 100644 --- a/process.c +++ b/process.c @@ -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()) -- cgit