diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-25 09:37:26 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-25 09:37:26 +0000 |
commit | 6223c55b579b3ca9355ac6b551a749e4ffe5146c (patch) | |
tree | c5db4175005d526fcddaa2797a983cd8820f371b | |
parent | 5be97645b434a729c5149cb69477e057f1009051 (diff) |
merges r30350 from trunk into ruby_1_9_2.
--
* ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
We must reinitialize GVL when new process creation. Otherwise
we may meet an insane deadlock. [Bug #4121][ruby-dev:42686]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/pty/pty.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Dec 25 15:08:08 2010 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec(). + We must reinitialize GVL at new process creation. Otherwise + we may meet an insane deadlock. [Bug#4121][ruby-dev:42686] + Wed Sep 8 22:46:31 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org> * ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 1d7aac6817..800e75959b 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -166,6 +166,8 @@ chfunc(void *data) struct exec_info arg; int status; + rb_thread_atfork_before_exec(); + /* * Set free from process group and controlling terminal */ @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 135 +#define RUBY_PATCHLEVEL 136 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |