* Merge YARV

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 17 insertions, 19 deletions

diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index a033a5b29..6a2d560b5 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -6,12 +6,14 @@
 
 require 'delegate'
 require 'tmpdir'
+require 'thread'
 
 # A class for managing temporary files.  This library is written to be
 # thread safe.
 class Tempfile < DelegateClass(File)
   MAX_TRY = 10
   @@cleanlist = []
+  @@lock = Mutex.new
 
   # Creates a temporary file of mode 0600 in the temporary directory
   # whose name is basename.pid.n and opens with mode "w+".  A Tempfile
@@ -26,27 +28,23 @@ class Tempfile < DelegateClass(File)
       tmpdir = '/tmp'
     end
 
-    lock = nil
+    lock = tmpname = nil
     n = failure = 0
-    
-    begin
-      Thread.critical = true
-
+    @@lock.synchronize {
       begin
-	tmpname = File.join(tmpdir, make_tmpname(basename, n))
-	lock = tmpname + '.lock'
-	n += 1
-      end while @@cleanlist.include?(tmpname) or
-	File.exist?(lock) or File.exist?(tmpname)
-
-      Dir.mkdir(lock)
-    rescue
-      failure += 1
-      retry if failure < MAX_TRY
-      raise "cannot generate tempfile `%s'" % tmpname
-    ensure
-      Thread.critical = false
-    end
+        begin
+          tmpname = File.join(tmpdir, make_tmpname(basename, n))
+          lock = tmpname + '.lock'
+          n += 1
+        end while @@cleanlist.include?(tmpname) or
+            File.exist?(lock) or File.exist?(tmpname)
+        Dir.mkdir(lock)
+      rescue
+        failure += 1
+        retry if failure < MAX_TRY
+        raise "cannot generate tempfile `%s'" % tmpname
+      end
+    }
 
     @data = [tmpname]
     @clean_proc = Tempfile.callback(@data)