Merge branch 'etehtsea-num_waiting_regression'

core/src/main/java/org/jruby/ext/thread/SizedQueue.java

@@ -12,7 +12,7 @@
  * rights and limitations under the License.
  *
  * Copyright (C) 2006 MenTaLguY <mental@rydia.net>
- * 
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -101,4 +101,19 @@ public synchronized IRubyObject initialize(ThreadContext context, IRubyObject ar
 
         return this;
     }
+
+    @JRubyMethod(name = {"push", "<<", "enq"}, required = 1, optional = 1)
+    @Override
+    public IRubyObject push(ThreadContext context, final IRubyObject[] args) {
+        checkShutdown();
+        numWaiting.incrementAndGet();
+        try {
+            context.getThread().executeTask(context, args, putTask);
+            return this;
+        } catch (InterruptedException ie) {
+            throw context.runtime.newThreadError("interrupted in " + getMetaClass().getName() + "#push");
+        } finally {
+            numWaiting.decrementAndGet();
+        }
+    }
 }

spec/ruby/library/thread/sizedqueue/num_waiting_spec.rb

@@ -4,4 +4,15 @@
 
 describe "Thread::SizedQueue#num_waiting" do
   it_behaves_like :queue_num_waiting, :num_waiting, SizedQueue.new(10)
+
+  it "reports the number of threads waiting to push" do
+    q = SizedQueue.new(1)
+    q.push(1)
+    t = Thread.new { q.push(2) }
+    sleep 0.05 until t.stop?
+    q.num_waiting.should == 1
+
+    q.pop
+    t.join
+  end
 end