ruby-changes:9620
From: yugui <ko1@a...>
Date: Mon, 29 Dec 2008 16:20:12 +0900 (JST)
Subject: [ruby-changes:9620] Ruby:r21160 (ruby_1_9_1): merges r21148 from trunk into ruby_1_9_1.
yugui 2008-12-29 16:19:32 +0900 (Mon, 29 Dec 2008) New Revision: 21160 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21160 Log: 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. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/test/ruby/test_thread.rb branches/ruby_1_9_1/thread.c Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21159) +++ ruby_1_9_1/ChangeLog (revision 21160) @@ -1,3 +1,12 @@ +Mon Dec 29 11:58:39 2008 Koichi Sasada <ko1@a...> + + * 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@r...> * cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com> Index: ruby_1_9_1/thread.c =================================================================== --- ruby_1_9_1/thread.c (revision 21159) +++ ruby_1_9_1/thread.c (revision 21160) @@ -2796,10 +2796,6 @@ VALUE locked = Qfalse; GetMutexPtr(self, mutex); - if (mutex->th == GET_THREAD()) { - rb_raise(rb_eThreadError, "deadlock; recursive locking"); - } - native_mutex_lock(&mutex->lock); if (mutex->th == 0) { mutex->th = GET_THREAD(); @@ -2871,11 +2867,16 @@ VALUE rb_mutex_lock(VALUE self) { + if (rb_mutex_trylock(self) == Qfalse) { mutex_t *mutex; rb_thread_t *th = GET_THREAD(); GetMutexPtr(self, mutex); + if (mutex->th == GET_THREAD()) { + rb_raise(rb_eThreadError, "deadlock; recursive locking"); + } + while (mutex->th != th) { int interrupted; enum rb_thread_status prev_status = th->status; Index: ruby_1_9_1/test/ruby/test_thread.rb =================================================================== --- ruby_1_9_1/test/ruby/test_thread.rb (revision 21159) +++ ruby_1_9_1/test/ruby/test_thread.rb (revision 21160) @@ -438,6 +438,18 @@ assert_equal(false, m3.locked?) end + def test_mutex_trylock + m = Mutex.new + assert_equal(true, m.try_lock) + assert_equal(false, m.try_lock, '[ruby-core:20943]') + + Thread.new{ + assert_equal(false, m.try_lock) + }.join + + m.unlock + end + def test_recursive_error o = Object.new def o.inspect -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/