diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:22:21 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-30 09:22:21 +0000 |
commit | d22b7e6ddbd5c616d90c82cb86fd5797cd2d5a61 (patch) | |
tree | 88ef4c2a3b07e3afa215d7b2317c2c97acaa8e2a /thread.c | |
parent | 303d9d972abfd73e5738d3e7eeb142b9689f0eb6 (diff) |
merges r20346 from trunk into ruby_1_9_1.
* process.c (rb_fork): stops the timer thread during fork.
[ruby-dev:37117]
* thread.c (rb_thread_start_timer_thread): timer thread needs
system_working to be set.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20406 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2371,6 +2371,7 @@ rb_thread_reset_timer_thread(void) void rb_thread_start_timer_thread(void) { + system_working = 1; rb_thread_create_timer_thread(); } |