Minor cleanup

Author: andrykonchin

spec/ruby/shared/sizedqueue/enque.rb

@@ -37,7 +37,7 @@
     q << 1
 
     t = Thread.new {
-      -> { q.send(@method, 2) }.should raise_error(ClosedQueueError)
+      -> { q.send(@method, 2) }.should raise_error(ClosedQueueError, "queue closed")
     }
 
     Thread.pass until q.num_waiting == 1
@@ -115,17 +115,20 @@
         -> { q.send(@method, 2, timeout: 1) }.should raise_error(ClosedQueueError, "queue closed")
       end
 
-      it "raise ClosedQueueError when getting closed during wait" do
+      it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
         q = @object.call(1)
-        q.push(1)
+        q << 1
 
         t = Thread.new {
-          -> { q.push(1, timeout: 0.1) }.should raise_error(ClosedQueueError, "queue closed")
+          -> { q.send(@method, 1, timeout: 0.1) }.should raise_error(ClosedQueueError, "queue closed")
         }
 
-        sleep(0.05)
+        Thread.pass until q.num_waiting == 1
+
         q.close
+
         t.join
+        q.pop.should == 1
       end
     end
   end

spec/truffleruby.next-specs

@@ -29,11 +29,11 @@ spec/ruby/core/queue/shift_spec.rb
 spec/ruby/core/sizedqueue/deq_spec.rb
 spec/ruby/core/sizedqueue/pop_spec.rb
 spec/ruby/core/sizedqueue/shift_spec.rb
+spec/ruby/core/sizedqueue/append_spec.rb
+spec/ruby/core/sizedqueue/enq_spec.rb
+spec/ruby/core/sizedqueue/push_spec.rb
 
 spec/ruby/core/module/refinements_spec.rb
 spec/ruby/core/refinement/refined_class_spec.rb
 spec/ruby/core/module/used_refinements_spec.rb
 spec/ruby/optional/capi/hash_spec.rb
-spec/ruby/core/sizedqueue/append_spec.rb
-spec/ruby/core/sizedqueue/enq_spec.rb
-spec/ruby/core/sizedqueue/push_spec.rb

src/main/java/org/truffleruby/core/queue/SizedQueueNodes.java

@@ -144,14 +144,14 @@ private static void doPushBlocking(Node node, final Object value, final SizedQue
         }
 
         @Specialization(guards = "!nonBlocking")
-        protected static Object pushBlocking(
+        protected static Object pushTimeout(
                 Node node, RubySizedQueue self, final Object value, boolean nonBlocking, long timeoutMilliseconds,
                 @Cached @Shared PropagateSharingNode propagateSharingNode) {
             final SizedQueue queue = self.queue;
             propagateSharingNode.execute(node, self, value);
             final long deadline = System.currentTimeMillis() + timeoutMilliseconds;
 
-            var success = getContext(node).getThreadManager().runUntilResult(node, () -> {
+            boolean success = getContext(node).getThreadManager().runUntilResult(node, () -> {
                 final long currentTimeout = deadline - System.currentTimeMillis();
                 final Object result;
 
@@ -164,11 +164,14 @@ protected static Object pushBlocking(
                 if (result == SizedQueue.CLOSED) {
                     throw new RaiseException(getContext(node), coreExceptions(node).closedQueueError(node));
                 }
-                return result;
+
+                return (boolean) result;
             });
-            if ((boolean) success) {
+
+            if (success) {
                 return self;
             }
+
             return nil;
         }