From 0811bd70e416daa03924286c8f324d76faad2a09 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 14 Jul 2004 14:51:42 +0000
Subject: * enum.c (enum_min_by): new method Enum#min_by.  added Enum#max_by  
 as well.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/thread.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib/thread.rb')

diff --git a/lib/thread.rb b/lib/thread.rb
index 8b27356c4..a069c4680 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -69,7 +69,7 @@ class Mutex
   # Returns +true+ if this lock is currently held by some thread.
   #
   def locked?
-    @locked
+    @locked && true
   end
 
   #
@@ -80,7 +80,7 @@ class Mutex
     result = false
     Thread.critical = true
     unless @locked
-      @locked = true
+      @locked = Thread.current
       result = true
     end
     Thread.critical = false
@@ -92,10 +92,13 @@ class Mutex
   #
   def lock
     while (Thread.critical = true; @locked)
+      if @locked == Thread.current
+        raise ThreadError, "deadlock; recursive locking"
+      end
       @waiting.push Thread.current
       Thread.stop
     end
-    @locked = true
+    @locked = Thread.current
     Thread.critical = false
     self
   end
-- 
cgit