Move handle data to RubyFiber.

Author: aardvark179

src/main/java/org/truffleruby/cext/ValueWrapperManager.java

@@ -19,6 +19,7 @@
 import org.truffleruby.SuppressFBWarnings;
 import org.truffleruby.cext.ValueWrapperManagerFactory.AllocateHandleNodeGen;
 import org.truffleruby.cext.ValueWrapperManagerFactory.GetHandleBlockHolderNodeGen;
+import org.truffleruby.core.fiber.RubyFiber;
 import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.language.ImmutableRubyObject;
 import org.truffleruby.language.NotProvided;
@@ -60,13 +61,12 @@ public class ValueWrapperManager {
 
     private volatile HandleBlockWeakReference[] blockMap = new HandleBlockWeakReference[0];
 
-    private final ThreadLocal<HandleThreadData> threadBlocks;
-
     private final RubyContext context;
+    private final RubyLanguage language;
 
     public ValueWrapperManager(RubyContext context) {
         this.context = context;
-        this.threadBlocks = ThreadLocal.withInitial(this::makeThreadData);
+        this.language = context.getLanguageSlow();
     }
 
     public HandleThreadData makeThreadData() {
@@ -81,14 +81,12 @@ public HandleThreadData makeThreadData() {
         return threadData;
     }
 
-    @TruffleBoundary
     public HandleThreadData getBlockHolder() {
-        return threadBlocks.get();
-    }
-
-    @TruffleBoundary
-    public void cleanupBlockHolder() {
-        threadBlocks.remove();
+        RubyFiber fiber = language.getCurrentThread().getCurrentFiber();
+        if (fiber.handleData == null) {
+            fiber.handleData = makeThreadData();
+        }
+        return fiber.handleData;
     }
 
     /* We keep a map of long wrappers that have been generated because various C extensions assume that any given fixnum
@@ -304,7 +302,7 @@ protected static class HandleBlockHolder {
         protected HandleBlock sharedHandleBlock = null;
     }
 
-    protected static class HandleThreadData {
+    public static class HandleThreadData {
 
         private final HandleBlockHolder holder = new HandleBlockHolder();
 

src/main/java/org/truffleruby/core/MarkingService.java

@@ -110,8 +110,6 @@ public void runAllMarkers(RubyContext context) {
         }
     }
 
-    private final ThreadLocal<MarkerThreadLocalData> threadLocalData;
-
     private final MarkRunnerService runnerService;
 
     private final UnsizedQueue keptObjectQueue = new UnsizedQueue();
@@ -182,18 +180,12 @@ public MarkerThreadLocalData getThreadLocalData() {
         return fiber.markingData;
     }
 
-    @TruffleBoundary
-    public void cleanupThreadLocalData() {
-        threadLocalData.remove();
-    }
-
     public MarkingService(RubyLanguage language, ReferenceProcessor referenceprocessor) {
         this(language, referenceprocessor.processingQueue);
     }
 
     public MarkingService(RubyLanguage language, ReferenceQueue<Object> processingQueue) {
         super(language, processingQueue);
-        threadLocalData = ThreadLocal.withInitial(this::makeThreadLocalData);
         runnerService = new MarkRunnerService(language, processingQueue, this);
     }
 

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

@@ -17,6 +17,7 @@
 import com.oracle.truffle.api.CompilerAsserts;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
+import org.truffleruby.cext.ValueWrapperManager;
 import org.truffleruby.core.MarkingService;
 import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
@@ -45,6 +46,7 @@ public final class RubyFiber extends RubyDynamicObject implements ObjectGraphNod
     public volatile Throwable uncaughtException = null;
     String sourceLocation;
     public MarkingService.MarkerThreadLocalData markingData = null;
+    public ValueWrapperManager.HandleThreadData handleData = null;
 
     public RubyFiber(
             RubyClass rubyClass,

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

@@ -617,10 +617,6 @@ public void initializeValuesForJavaThread(RubyThread rubyThread, Thread thread)
     }
 
     public void cleanupValuesForJavaThread(Thread thread) {
-        if (Thread.currentThread() == thread) {
-            context.getMarkingService().cleanupThreadLocalData();
-            context.getValueWrapperManager().cleanupBlockHolder();
-        }
         javaThreadToRubyThread.remove(thread);
     }