diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:01 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-28 09:42:01 +0000 |
| commit | a929fd040a7dff2ab7739ad5e1389db4c2c2ec12 (patch) | |
| tree | 0d1cd7745506d11538289ba3bfe86f262617f77f /process.c | |
| parent | 6a0e4079f3a46d5bbd7b5756396bf3479570fae9 (diff) | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
| -rw-r--r-- | process.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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()) |