jruby · Mar 13, 2015 · Mar 13, 2015 · Mar 13, 2015 · Mar 13, 2015
diff --git a/spec/truffle/tags/core/thread/join_tags.txt b/spec/truffle/tags/core/thread/join_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ThreadNodes.java
@@ -148,18 +148,29 @@ public JoinNode(JoinNode prev) {
         }
 
         @Specialization
-        public RubyThread join(RubyThread self, UndefinedPlaceholder timeout) {
+        public RubyThread join(RubyThread thread, UndefinedPlaceholder timeout) {
             notDesignedForCompilation();
 
-            self.join();
-            return self;
+            thread.join();
+            return thread;
         }
 
         @Specialization
-        public Object join(RubyThread self, int timeout) {
+        public Object join(RubyThread thread, int timeout) {
             notDesignedForCompilation();
 
-            if (self.join(timeout)) {
+            return joinMillis(thread, timeout * 1000);
+        }
+
+        @Specialization
+        public Object join(RubyThread thread, double timeout) {
+            notDesignedForCompilation();
+
+            return joinMillis(thread, (int) (timeout * 1000.0));
+        }
+
+        private Object joinMillis(RubyThread self, int timeoutInMillis) {
+            if (self.join(timeoutInMillis)) {
                 return self;
             } else {
                 return getContext().getCoreLibrary().getNilObject();

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyThread.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/RubyThread.java
@@ -43,6 +43,8 @@ public class RubyThread extends RubyBasicObject {
 
     private String name;
 
+    /** We use this instead of {@link Thread#join()} since we don't always have a reference
+     * to the {@link Thread} and we want to handle cases where the Thread did not start yet. */
     private final CountDownLatch finished = new CountDownLatch(1);
 
     private volatile Thread thread;
@@ -99,7 +101,7 @@ public void run(final RubyContext context, Node currentNode, String info, Runnab
         } catch (RaiseException e) {
             exception = e.getRubyException();
         } catch (ReturnException e) {
-            exception = getContext().getCoreLibrary().unexpectedReturn(currentNode);
+            exception = context.getCoreLibrary().unexpectedReturn(currentNode);
         } finally {
             cleanup(context);
         }
@@ -108,7 +110,7 @@ public void run(final RubyContext context, Node currentNode, String info, Runnab
     // Only used by the main thread which cannot easily wrap everything inside a try/finally.
     public void cleanup(RubyContext context) {
         status = Status.ABORTING;
-        context.getThreadManager().leaveGlobalLock();
+        manager.leaveGlobalLock();
         context.getSafepointManager().leaveThread();
         manager.unregisterThread(this);
 
@@ -123,7 +125,7 @@ public void setRootThread(Thread thread) {
     }
 
     public void join() {
-        getContext().getThreadManager().runUntilResult(new BlockingActionWithoutGlobalLock<Boolean>() {
+        manager.runUntilResult(new BlockingActionWithoutGlobalLock<Boolean>() {
             @Override
             public Boolean block() throws InterruptedException {
                 finished.await();
@@ -136,11 +138,11 @@ public Boolean block() throws InterruptedException {
         }
     }
 
-    public boolean join(final int timeout) {
-        final boolean joined = getContext().getThreadManager().runOnce(new BlockingActionWithoutGlobalLock<Boolean>() {
+    public boolean join(final int timeoutInMillis) {
+        final boolean joined = manager.runOnce(new BlockingActionWithoutGlobalLock<Boolean>() {
             @Override
             public Boolean block() throws InterruptedException {
-                return finished.await(timeout, TimeUnit.SECONDS);
+                return finished.await(timeoutInMillis, TimeUnit.MILLISECONDS);
             }
         });
 

diff --git a/truffle/src/main/ruby/core/rubinius/common/mutex.rb b/truffle/src/main/ruby/core/rubinius/common/mutex.rb
@@ -40,6 +40,8 @@ def synchronize
   def sleep(duration=undefined)
     if duration.kind_of?(Numeric) && duration < 0
       raise ArgumentError, "time interval must be positive"
+    elsif duration == nil
+      duration = undefined
     end
 
     unlock

diff --git a/truffle/src/main/ruby/core/shims.rb b/truffle/src/main/ruby/core/shims.rb
@@ -9,10 +9,6 @@
 # These are implemented just to get other stuff working - we'll go back and
 # implement these properly later.
 
-# Here otherwise it causes problems for RubySpec
-class Channel
-end
-
 class IO
   def external_encoding
     @external