diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-29 07:19:32 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-29 07:19:32 +0000 |
| commit | a25b3c05e7600a5b66e8043b6e9dbb8927bca94b (patch) | |
| tree | c2d478f0bb22a5f7fada4c6e71943803c160d4ae /ChangeLog | |
| parent | 0d546bd1ff9dd4ac57c7a2d37ef0e9653c0b3810 (diff) | |
merges r21148 from trunk into ruby_1_9_1.
* thread.c (rb_mutex_trylock): return false if Mutex owned
by current thread. [ruby-core:20943]
* thread.c (rb_mutex_lock): check dead lock (recursive lock) here.
* test/ruby/test_thread.rb: add a test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21160 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 @@ +Mon Dec 29 11:58:39 2008 Koichi Sasada <ko1@atdot.net> + + * thread.c (rb_mutex_trylock): return false if Mutex owned + by current thread. [ruby-core:20943] + + * thread.c (rb_mutex_lock): check dead lock (recursive lock) here. + + * test/ruby/test_thread.rb: add a test. + Mon Dec 29 07:15:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com> |