Make retryWhileInterrupted() an instance method to check the context is not entered

Author: eregon

src/main/java/org/truffleruby/core/fiber/FiberManager.java

@@ -128,7 +128,7 @@ public static void waitForInitialization(RubyContext context, RubyFiber fiber, N
         if (context.getEnv().getContext().isEntered()) {
             context.getThreadManager().runUntilResultKeepStatus(currentNode, blockingAction);
         } else {
-            ThreadManager.retryWhileInterrupted(blockingAction);
+            context.getThreadManager().retryWhileInterrupted(blockingAction);
         }
 
         final Throwable uncaughtException = fiber.uncaughtException;
@@ -230,7 +230,7 @@ private void addToMessageQueue(RubyFiber fiber, FiberMessage message) {
     @TruffleBoundary
     private FiberMessage waitMessage(RubyFiber fiber) {
         assert !context.getEnv().getContext().isEntered() : "should have left context while waiting fiber message";
-        return ThreadManager.retryWhileInterrupted(fiber.messageQueue::take);
+        return context.getThreadManager().retryWhileInterrupted(fiber.messageQueue::take);
     }
 
     @TruffleBoundary
@@ -330,7 +330,7 @@ public void killOtherFibers() {
         final TruffleContext truffleContext = context.getEnv().getContext();
         context.getThreadManager().leaveAndEnter(truffleContext, null, () -> {
             doKillOtherFibers();
-            return null;
+            return BlockingAction.SUCCESS;
         }, true);
     }
 
@@ -341,7 +341,7 @@ private void doKillOtherFibers() {
 
                 // Wait for the Fiber to finish so we only run one Fiber at a time
                 final CountDownLatch finishedLatch = fiber.finishedLatch;
-                ThreadManager.retryWhileInterrupted(() -> {
+                context.getThreadManager().retryWhileInterrupted(() -> {
                     finishedLatch.await();
                     return BlockingAction.SUCCESS;
                 });

src/main/java/org/truffleruby/core/thread/ThreadManager.java

@@ -476,9 +476,10 @@ public <T> T leaveAndEnter(TruffleContext truffleContext, Node currentNode, Supp
         }
     }
 
-    /** Only use when no context is available. */
+    /** Only use when the context is not entered. */
     @TruffleBoundary
-    public static <T> T retryWhileInterrupted(BlockingAction<T> action) {
+    public <T> T retryWhileInterrupted(BlockingAction<T> action) {
+        assert !context.getEnv().getContext().isEntered() : "Use runUntilResult*() when entered";
         boolean interrupted = false;
         try {
             while (true) {