summaryrefslogtreecommitdiff
path: root/process.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-27 10:40:57 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-27 10:40:57 +0000
commita94adfa245ec353883bb7f626b70d71eff25d935 (patch)
treeaaee0a952f495a155ac7fd94e75e81e3d8269d60 /process.c
parentb5d2750bbc5b9300a7694489d5eadc6dae12fe24 (diff)
* 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/trunk@21097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/process.c b/process.c
index 1e8546db06..f965161e2f 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())