1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* thread.c (rb_mutex_trylock): return false if Mutex owned

Browse Source 
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/trunk@21148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2008-12-29 03:03:09 +00:00
parent a928613a31
commit b2ad49565f
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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 10:58:54 2008 NARUSE, Yui <naruse@ruby-lang.org> Mon Dec 29 10:58:54 2008 NARUSE, Yui <naruse@ruby-lang.org>
* file.c (rb_get_path): move encoding conversion of file path * file.c (rb_get_path): move encoding conversion of file path

12
test/ruby/test_thread.rb
View File

@ -438,6 +438,18 @@ class TestThread < Test::Unit::TestCase
assert_equal(false, m3.locked?) assert_equal(false, m3.locked?)
end 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 def test_recursive_error
o = Object.new o = Object.new
def o.inspect def o.inspect

9
thread.c
View File

@ -2796,10 +2796,6 @@ rb_mutex_trylock(VALUE self)
VALUE locked = Qfalse; VALUE locked = Qfalse;
GetMutexPtr(self, mutex); GetMutexPtr(self, mutex);
if (mutex->th == GET_THREAD()) {
rb_raise(rb_eThreadError, "deadlock; recursive locking");
}
native_mutex_lock(&mutex->lock); native_mutex_lock(&mutex->lock);
if (mutex->th == 0) { if (mutex->th == 0) {
mutex->th = GET_THREAD(); mutex->th = GET_THREAD();
@ -2871,11 +2867,16 @@ lock_interrupt(void *ptr)
VALUE VALUE
rb_mutex_lock(VALUE self) rb_mutex_lock(VALUE self)
{ {
if (rb_mutex_trylock(self) == Qfalse) { if (rb_mutex_trylock(self) == Qfalse) {
mutex_t *mutex; mutex_t *mutex;
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
GetMutexPtr(self, mutex); GetMutexPtr(self, mutex);
if (mutex->th == GET_THREAD()) {
rb_raise(rb_eThreadError, "deadlock; recursive locking");
}
while (mutex->th != th) { while (mutex->th != th) {
int interrupted; int interrupted;
enum rb_thread_status prev_status = th->status; enum rb_thread_status prev_status = th->status;