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

3 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 94b67b1e6..7bd1aadc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 
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())
 
diff --git a/thread.c b/thread.c
index 9e0cebfae..2fcac4995 100644
--- a/thread.c
+++ b/thread.c
@@ -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;