diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 10:40:57 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-27 10:40:57 +0000 |
| commit | 0a7e7ec7f5c32407cfbd978ffe3d7b04dbe94693 (patch) | |
| tree | aaee0a952f495a155ac7fd94e75e81e3d8269d60 /process.c | |
| parent | cca906e87b944c16a0e4030925a2f4f843d9a077 (diff) | |
| download | ruby-0a7e7ec7f5c32407cfbd978ffe3d7b04dbe94693.tar.gz ruby-0a7e7ec7f5c32407cfbd978ffe3d7b04dbe94693.tar.xz ruby-0a7e7ec7f5c32407cfbd978ffe3d7b04dbe94693.zip | |
* 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/trunk@21097 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()) |