Moving marking thread local data to RubyFiber.

Author: aardvark179

src/main/java/org/truffleruby/RubyContext.java

@@ -189,8 +189,8 @@ public RubyContext(RubyLanguage language, TruffleLanguage.Env env) {
         codeLoader = new CodeLoader(language, this);
         featureLoader = new FeatureLoader(this, language);
         referenceProcessor = new ReferenceProcessor(this);
-        finalizationService = new FinalizationService(referenceProcessor);
-        markingService = new MarkingService(referenceProcessor);
+        finalizationService = new FinalizationService(getLanguageSlow(), referenceProcessor);
+        markingService = new MarkingService(getLanguageSlow(), referenceProcessor);
 
         // We need to construct this at runtime
         random = createRandomInstance();

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

@@ -208,7 +208,7 @@ private static final class ThreadLocalState {
     public final FrozenStringLiterals frozenStringLiterals;
 
     public final ReferenceQueue<Object> sharedReferenceQueue = new ReferenceQueue<>();
-    public final FinalizationService sharedFinzationService = new FinalizationService(sharedReferenceQueue);
+    public final FinalizationService sharedFinzationService = new FinalizationService(this, sharedReferenceQueue);
     public volatile ValueWrapperManager.HandleBlockWeakReference[] handleBlockSharedMap = new ValueWrapperManager.HandleBlockWeakReference[0];
     public final ValueWrapperManager.HandleBlockAllocator handleBlockAllocator = new ValueWrapperManager.HandleBlockAllocator();
 

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

@@ -14,6 +14,7 @@
 import java.util.Objects;
 
 import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.MarkingService.ExtensionCallStack;
 import org.truffleruby.language.RubyDynamicObject;
 
@@ -47,12 +48,12 @@ public RubyDynamicObject getRoot() {
         }
     }
 
-    public FinalizationService(ReferenceQueue<Object> processingQueue) {
-        super(processingQueue);
+    public FinalizationService(RubyLanguage language, ReferenceQueue<Object> processingQueue) {
+        super(language, processingQueue);
     }
 
-    public FinalizationService(ReferenceProcessor referenceProcessor) {
-        this(referenceProcessor.processingQueue);
+    public FinalizationService(RubyLanguage language, ReferenceProcessor referenceProcessor) {
+        this(language, referenceProcessor.processingQueue);
     }
 
     @TruffleBoundary

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

@@ -13,8 +13,10 @@
 import java.util.ArrayList;
 
 import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.cext.ValueWrapperManager;
 import org.truffleruby.core.array.ArrayUtils;
+import org.truffleruby.core.fiber.RubyFiber;
 import org.truffleruby.core.queue.UnsizedQueue;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -57,9 +59,10 @@ public static class MarkRunnerService extends ReferenceProcessingService<Marking
         private final MarkingService markingService;
 
         public MarkRunnerService(
+                RubyLanguage lanugage,
                 ReferenceQueue<Object> processingQueue,
                 MarkingService markingService) {
-            super(processingQueue);
+            super(lanugage, processingQueue);
             this.markingService = markingService;
         }
 
@@ -172,22 +175,26 @@ public Object getBlock() {
 
     @TruffleBoundary
     public MarkerThreadLocalData getThreadLocalData() {
-        return threadLocalData.get();
+        RubyFiber fiber = language.getCurrentThread().getCurrentFiber();
+        if (fiber.markingData == null) {
+            fiber.markingData = makeThreadLocalData();
+        }
+        return fiber.markingData;
     }
 
     @TruffleBoundary
     public void cleanupThreadLocalData() {
         threadLocalData.remove();
     }
 
-    public MarkingService(ReferenceProcessor referenceprocessor) {
-        this(referenceprocessor.processingQueue);
+    public MarkingService(RubyLanguage language, ReferenceProcessor referenceprocessor) {
+        this(language, referenceprocessor.processingQueue);
     }
 
-    public MarkingService(ReferenceQueue<Object> processingQueue) {
-        super(processingQueue);
+    public MarkingService(RubyLanguage language, ReferenceQueue<Object> processingQueue) {
+        super(language, processingQueue);
         threadLocalData = ThreadLocal.withInitial(this::makeThreadLocalData);
-        runnerService = new MarkRunnerService(processingQueue, this);
+        runnerService = new MarkRunnerService(language, processingQueue, this);
     }
 
     @TruffleBoundary

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

@@ -16,6 +16,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import org.truffleruby.RubyContext;
+import org.truffleruby.RubyLanguage;
 import org.truffleruby.SuppressFBWarnings;
 import org.truffleruby.core.thread.RubyThread;
 import org.truffleruby.core.thread.ThreadManager;
@@ -250,8 +251,10 @@ protected final void drainReferenceQueues() {
     private R first = null;
 
     protected final ReferenceQueue<Object> processingQueue;
+    protected final RubyLanguage language;
 
-    public ReferenceProcessingService(ReferenceQueue<Object> processingQueue) {
+    public ReferenceProcessingService(RubyLanguage language, ReferenceQueue<Object> processingQueue) {
+        this.language = language;
         this.processingQueue = processingQueue;
     }
 

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.core.MarkingService;
 import org.truffleruby.core.array.ArrayHelpers;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.basicobject.RubyBasicObject;
@@ -43,6 +44,7 @@ public final class RubyFiber extends RubyDynamicObject implements ObjectGraphNod
     volatile boolean transferred = false;
     public volatile Throwable uncaughtException = null;
     String sourceLocation;
+    public MarkingService.MarkerThreadLocalData markingData = null;
 
     public RubyFiber(
             RubyClass rubyClass,