Remove the now-unnecessary javaThreadToRubyThread Map

Author: eregon

src/main/java/org/truffleruby/RubyLanguage.java

@@ -583,8 +583,8 @@ public void initializeThread(RubyContext context, Thread thread) {
         }
 
         if (context.getThreadManager().isRubyManagedThread(thread)) {
-            final RubyThread rubyThread = context.getThreadManager().getCurrentThreadOrNull();
-            if (rubyThread != null && rubyThread.thread == thread) { // new Ruby Thread
+            final RubyThread rubyThread = getCurrentThread();
+            if (rubyThread.thread == thread) { // new Ruby Thread
                 if (thread != Thread.currentThread()) {
                     throw CompilerDirectives
                             .shouldNotReachHere("Ruby threads should be initialized on their Java thread");
@@ -602,9 +602,7 @@ public void initializeThread(RubyContext context, Thread thread) {
 
     @Override
     public void disposeThread(RubyContext context, Thread thread) {
-        LOGGER.fine(
-                () -> "disposeThread(#" + thread.getId() + " " + thread + " on " +
-                        context.getThreadManager().getCurrentThreadOrNull() + ")");
+        LOGGER.fine(() -> "disposeThread(#" + thread.getId() + " " + thread + " on " + getCurrentThread() + ")");
 
         if (thread == context.getThreadManager().getRootJavaThread()) {
             if (context.getEnv().isPreInitialization()) {
@@ -623,8 +621,8 @@ public void disposeThread(RubyContext context, Thread thread) {
         }
 
         if (context.getThreadManager().isRubyManagedThread(thread)) {
-            final RubyThread rubyThread = context.getThreadManager().getCurrentThreadOrNull();
-            if (rubyThread != null && rubyThread.thread == thread) { // Thread
+            final RubyThread rubyThread = getCurrentThread();
+            if (rubyThread.thread == thread) { // Thread
                 if (thread != Thread.currentThread()) {
                     throw CompilerDirectives.shouldNotReachHere("Ruby threads should be disposed on their Java thread");
                 }
@@ -636,7 +634,7 @@ public void disposeThread(RubyContext context, Thread thread) {
         }
 
         // A foreign Thread, its Fibers are considered isRubyManagedThread()
-        final RubyThread rubyThread = context.getThreadManager().getRubyThreadForJavaThread(thread);
+        final RubyThread rubyThread = this.rubyThread.get(thread);
         context.getThreadManager().cleanup(rubyThread, thread);
     }
 

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

@@ -315,27 +315,20 @@ public void safepoint(RubyFiber fromFiber, RubyFiber fiber, SafepointAction acti
     }
 
     public void start(RubyFiber fiber, Thread javaThread) {
-        final ThreadManager threadManager = context.getThreadManager();
-
         fiber.thread = javaThread;
 
         final RubyThread rubyThread = fiber.rubyThread;
-        threadManager.initializeValuesForJavaThread(rubyThread, javaThread);
 
         // share RubyFiber as its fiberLocals might be accessed by other threads with Thread#[]
         SharedObjects.propagate(language, rubyThread, fiber);
         rubyThread.runningFibers.add(fiber);
     }
 
     public void cleanup(RubyFiber fiber, Thread javaThread) {
-        final ThreadManager threadManager = context.getThreadManager();
-
         context.getValueWrapperManager().cleanup(context, fiber.handleData);
 
         fiber.status = FiberStatus.TERMINATED;
 
-        threadManager.cleanupValuesForJavaThread(javaThread);
-
         fiber.rubyThread.runningFibers.remove(fiber);
 
         fiber.thread = null;

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

@@ -10,7 +10,6 @@
 package org.truffleruby.core.thread;
 
 import java.util.Collections;
-import java.util.Map;
 import java.util.Set;
 import java.util.Timer;
 import java.util.WeakHashMap;
@@ -21,7 +20,6 @@
 import java.util.function.Supplier;
 
 import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.ValueType;
 import com.oracle.truffle.api.TruffleContext;
 import com.oracle.truffle.api.TruffleSafepoint;
@@ -73,8 +71,6 @@ public class ThreadManager {
     private final RubyThread rootThread;
     @CompilationFinal private Thread rootJavaThread;
 
-    private final Map<Thread, RubyThread> javaThreadToRubyThread = new ConcurrentHashMap<>();
-
     private final Set<RubyThread> runningRubyThreads = ConcurrentHashMap.newKeySet();
 
     /** The set of Java threads TruffleRuby created, and is responsible to exit in {@link #killAndWaitOtherThreads()}.
@@ -170,7 +166,6 @@ private Thread createJavaThread(Runnable runnable, RubyThread rubyThread, String
         language.rubyFiberInitMap.put(thread, rubyThread.getRootFiber());
         thread.setName(NAME_PREFIX + " id=" + thread.getId() + " from " + info);
         rubyManagedThreads.add(thread); // need to be set before initializeThread()
-        javaThreadToRubyThread.put(thread, rubyThread); // need to be set before initializeThread()
         thread.setUncaughtExceptionHandler(uncaughtExceptionHandler(rubyThread.getRootFiber()));
         return thread;
     }
@@ -591,29 +586,6 @@ Interrupter getNativeCallInterrupter() {
         }
     }
 
-    public void initializeValuesForJavaThread(RubyThread rubyThread, Thread thread) {
-        javaThreadToRubyThread.put(thread, rubyThread);
-    }
-
-    public void cleanupValuesForJavaThread(Thread thread) {
-        javaThreadToRubyThread.remove(thread);
-    }
-
-    @TruffleBoundary
-    public RubyThread getRubyThreadForJavaThread(Thread thread) {
-        final RubyThread rubyThread = javaThreadToRubyThread.get(thread);
-        if (rubyThread == null) {
-            throw CompilerDirectives.shouldNotReachHere(
-                    "No Ruby Thread is associated with Java Thread: " + thread);
-        }
-        return rubyThread;
-    }
-
-    @TruffleBoundary
-    public RubyThread getCurrentThreadOrNull() {
-        return javaThreadToRubyThread.get(Thread.currentThread());
-    }
-
     public void registerThread(RubyThread thread) {
         if (!runningRubyThreads.add(thread)) {
             throw new UnsupportedOperationException(thread + " was already registered");
@@ -714,7 +686,7 @@ public String getThreadDebugInfo() {
             }
 
             // cannot use getCurrentThread() as it might have been cleared
-            if (thread == getCurrentThreadOrNull()) {
+            if (thread == language.getCurrentThread()) {
                 builder.append(" (current)");
             }
 

src/main/java/org/truffleruby/language/SafepointManager.java

@@ -35,7 +35,7 @@ public void pauseRubyThreadAndExecute(Node currentNode, SafepointAction action)
         final ThreadManager threadManager = context.getThreadManager();
         final RubyThread rubyThread = action.getTargetThread();
 
-        if (threadManager.getCurrentThreadOrNull() == rubyThread) {
+        if (context.getEnv().getContext().isEntered() && context.getLanguageSlow().getCurrentThread() == rubyThread) {
             if (context.getLanguageSlow().getCurrentFiber() != rubyThread.getCurrentFiber()) {
                 throw CompilerDirectives.shouldNotReachHere(
                         "The currently executing Java thread does not correspond to the currently active fiber for the current Ruby thread");