From b3706a2f39057378e0b40c0acbc1deb89c820735 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 29 Dec 2008 07:19:32 +0000
Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 thread.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'thread.c')

diff --git a/thread.c b/thread.c
index bdf21c50a..081c3cd50 100644
--- a/thread.c
+++ b/thread.c
@@ -2796,10 +2796,6 @@ rb_mutex_trylock(VALUE self)
     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 @@ lock_interrupt(void *ptr)
 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;
-- 
cgit