[Truffle] Fix location of Rubinius and rubinius-core-api thread.rb code.

jruby · Mar 17, 2015 · 8e37042 · 8e37042 · chrisseaton · Mar 17, 2015
1 parent 3ea1da0
commit 8e37042
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/truffle/src/main/ruby/core.rb b/truffle/src/main/ruby/core.rb
@@ -70,6 +70,7 @@
 require_relative 'core/rubinius/common/signal'
 require_relative 'core/rubinius/common/splitter'
 require_relative 'core/rubinius/common/mutex'
+require_relative 'core/rubinius/common/thread'
 require_relative 'core/rubinius/common/throw_catch'
 require_relative 'core/rubinius/common/time'
 require_relative 'core/rubinius/common/true'

diff --git a/truffle/src/main/ruby/core/rubinius/api/kernel/common/thread.rb b/truffle/src/main/ruby/core/rubinius/api/kernel/common/thread.rb
@@ -41,10 +41,6 @@ class Thread
   # recurse back to :foo, it could require making
   # the tables independant.
 
-  def randomizer
-    @randomizer ||= Rubinius::Randomizer.new
-  end
-
   def self.recursion_guard(obj)
     id = obj.object_id
     objects = current.recursive_objects

diff --git a/truffle/src/main/ruby/core/rubinius/common/thread.rb b/truffle/src/main/ruby/core/rubinius/common/thread.rb
@@ -0,0 +1,41 @@
+# Copyright (c) 2007-2014, Evan Phoenix and contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of Rubinius nor the names of its contributors
+#   may be used to endorse or promote products derived from this software
+#   without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Only part of Rubinius' thread.rb
+
+#--
+# Be very careful about calling raise in here! Thread has its own
+# raise which, if you're calling raise, you probably don't want. Use
+# Kernel.raise to call the proper raise.
+#++
+
+class Thread
+
+  def randomizer
+    @randomizer ||= Rubinius::Randomizer.new
+  end
+
+end