jruby · Nov 6, 2014 · Nov 6, 2014 · Nov 6, 2014 · Nov 6, 2014
Showing with 19 additions and 9 deletions.

+1 −0 core/src/main/java/org/jruby/ext/thread/ConditionVariable.java

+11 −7 core/src/main/java/org/jruby/ext/thread/Queue.java

+3 −1 core/src/main/java/org/jruby/ext/thread/SizedQueue.java

+4 −1 test/mri/excludes/TestQueue.rb
diff --git a/core/src/main/java/org/jruby/ext/thread/ConditionVariable.java b/core/src/main/java/org/jruby/ext/thread/ConditionVariable.java
@@ -61,6 +61,7 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
                 return new ConditionVariable(runtime, klass);
             }
         });
+        cConditionVariable.undefineMethod("initialize_copy");
         cConditionVariable.setReifiedClass(ConditionVariable.class);
         cConditionVariable.defineAnnotatedMethods(ConditionVariable.class);
     }

diff --git a/core/src/main/java/org/jruby/ext/thread/Queue.java b/core/src/main/java/org/jruby/ext/thread/Queue.java
@@ -65,16 +65,19 @@ public void wakeup(RubyThread thread, Queue data) {
         }
     };
 
-    final RubyThread.Task<IRubyObject, IRubyObject> putTask = new RubyThread.Task<IRubyObject, IRubyObject>() {
+    final RubyThread.Task<IRubyObject[], IRubyObject> putTask = new RubyThread.Task<IRubyObject[], IRubyObject>() {
         @Override
-        public IRubyObject run(ThreadContext context, IRubyObject data) throws InterruptedException {
+        public IRubyObject run(ThreadContext context, IRubyObject[] args) throws InterruptedException {
             final BlockingQueue<IRubyObject> queue = getQueueSafe();
-            queue.put(data);
+            if(args.length == 2 && args[1].isTrue() && queue.remainingCapacity() == 0) {
+                throw context.runtime.newThreadError("queue full");
+            }
+            queue.put(args[0]);
             return context.nil;
         }
 
         @Override
-        public void wakeup(RubyThread thread, IRubyObject data) {
+        public void wakeup(RubyThread thread, IRubyObject[] data) {
             thread.getNativeThread().interrupt();
         }
     };
@@ -90,6 +93,7 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
                 return new Queue(runtime, klass);
             }
         });
+        cQueue.undefineMethod("initialize_copy");
         cQueue.setReifiedClass(Queue.class);
         cQueue.defineAnnotatedMethods(Queue.class);
     }
@@ -165,11 +169,11 @@ public IRubyObject pop(ThreadContext context, IRubyObject arg0) {
         return pop(context, !arg0.isTrue());
     }
 
-    @JRubyMethod(name = {"push", "<<", "enq"})
-    public IRubyObject push(ThreadContext context, final IRubyObject value) {
+    @JRubyMethod(name = {"push", "<<", "enq"}, required = 1, optional = 1)
+    public IRubyObject push(ThreadContext context, final IRubyObject[] args) {
         checkShutdown();
         try {
-            context.getThread().executeTask(context, value, putTask);
+            context.getThread().executeTask(context, args, putTask);
             return this;
         } catch (InterruptedException ie) {
             throw context.runtime.newThreadError("interrupted in " + getMetaClass().getName() + "#push");

diff --git a/core/src/main/java/org/jruby/ext/thread/SizedQueue.java b/core/src/main/java/org/jruby/ext/thread/SizedQueue.java
@@ -82,8 +82,10 @@ public RubyNumeric max(ThreadContext context) {
     }
 
     @JRubyMethod(name = "max=")
-    public IRubyObject max_set(ThreadContext context, IRubyObject arg) {
+    public synchronized IRubyObject max_set(ThreadContext context, IRubyObject arg) {
+        BlockingQueue<IRubyObject> oldQueue = this.queue;
         initialize(context, arg);
+        oldQueue.drainTo(this.queue);
         return arg;
     }
 

diff --git a/test/mri/excludes/TestQueue.rb b/test/mri/excludes/TestQueue.rb
@@ -1,2 +1,5 @@
-exclude :test_sized_queue_assign_max, "hangs"
 exclude :test_thr_kill, "needs investigation"
+exclude :test_thr_kill, "needs investigation"
+exclude :test_dump, "tests MRI-specific exception"
+exclude :test_queue_initialized, "tests MRI-specific failure"
+exclude :test_sized_queue_initialized, "tests MRI-specific failure"