diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:24 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:47:24 +0000 |
commit | 486f93b789bb0d520ffeeb7c71857b3a7cd22bce (patch) | |
tree | 0a6c09a9a5f9d59bfb29e95d03e550f7c82060ac /ChangeLog | |
parent | 509a936e10588f2a205eb6c26ef56163f8720df3 (diff) |
merges r20229 and r20230 from trunk into ruby_1_9_1.
* thread.c (rb_barrier_{new,wait,release,destroy}): use Mutex so that
circular requires fail with deadlock. [ruby-core:19821]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,12 @@ +Thu Nov 13 11:31:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * thread.c (rb_barrier_wait): gets rid of recursive deadlock. + +Thu Nov 13 06:08:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * thread.c (rb_barrier_{new,wait,release,destroy}): use Mutex so that + circular requires fail with deadlock. [ruby-core:19821] + Wed Nov 12 07:16:01 2008 David Flanagan <david@think32> * ruby.c (set_internal_encoding_once): fix typo in error string |