Encapsulate RubyThread#ioBuffer

oracle · Sep 26, 2022 · f94339e · f94339e
1 parent b05feef
commit f94339e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/org/truffleruby/core/support/IONodes.java b/src/main/java/org/truffleruby/core/support/IONodes.java
@@ -523,8 +523,7 @@ protected RubyPointer getThreadBuffer(long size,
 
         public static Pointer getBuffer(RubyContext context, RubyThread rubyThread, long size,
                 ConditionProfile sizeProfile) {
-            Pointer.checkNativeAccess(context);
-            return rubyThread.ioBuffer.allocate(context, rubyThread, size, sizeProfile);
+            return rubyThread.getIoBuffer(context).allocate(context, rubyThread, size, sizeProfile);
         }
     }
 
@@ -535,8 +534,7 @@ public abstract static class IOThreadBufferFreeNode extends PrimitiveArrayArgume
         protected Object getThreadBuffer(RubyPointer pointer,
                 @Cached ConditionProfile freeProfile) {
             RubyThread thread = getLanguage().getCurrentThread();
-            Pointer.checkNativeAccess(getContext());
-            thread.ioBuffer.free(thread, pointer.pointer, freeProfile);
+            thread.getIoBuffer(getContext()).free(thread, pointer.pointer, freeProfile);
             return nil;
         }
     }

diff --git a/src/main/java/org/truffleruby/core/thread/RubyThread.java b/src/main/java/org/truffleruby/core/thread/RubyThread.java
@@ -31,6 +31,7 @@
 import org.truffleruby.core.support.PRNGRandomizerNodes;
 import org.truffleruby.core.support.RubyPRNGRandomizer;
 import org.truffleruby.core.tracepoint.TracePointState;
+import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.objects.ObjectGraph;
@@ -62,7 +63,7 @@ public final class RubyThread extends RubyDynamicObject implements ObjectGraphNo
     volatile Object value = null;
     public final AtomicBoolean wakeUp = new AtomicBoolean(false);
     volatile int priority = Thread.NORM_PRIORITY;
-    public ThreadLocalBuffer ioBuffer;
+    ThreadLocalBuffer ioBuffer;
     Object threadGroup;
     public String sourceLocation;
     Object name = Nil.INSTANCE;
@@ -132,6 +133,11 @@ public void setCurrentFiber(RubyFiber fiber) {
         currentFiber = fiber;
     }
 
+    public ThreadLocalBuffer getIoBuffer(RubyContext context) {
+        Pointer.checkNativeAccess(context);
+        return ioBuffer;
+    }
+
     @Override
     public void getAdjacentObjects(Set<Object> reachable) {
         ObjectGraph.addProperty(reachable, threadLocalVariables);

diff --git a/src/main/java/org/truffleruby/language/loader/FeatureLoader.java b/src/main/java/org/truffleruby/language/loader/FeatureLoader.java
@@ -225,7 +225,7 @@ private String initializeWorkingDirectory() {
             final Encoding localeEncoding = context.getEncodingManager().getLocaleEncoding().jcoding;
             return new String(bytes, EncodingManager.charsetForEncoding(localeEncoding));
         } finally {
-            rubyThread.ioBuffer.free(rubyThread, buffer, ConditionProfile.getUncached());
+            rubyThread.getIoBuffer(context).free(rubyThread, buffer, ConditionProfile.getUncached());
         }
     }