renamed PythonContext.SharedContextData to SharedMultiprocessingData

Author: tomasstupka

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MultiprocessingModuleBuiltins.java

@@ -77,7 +77,7 @@
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonContext.SharedContextData;
+import com.oracle.graal.python.runtime.PythonContext.SharedMultiprocessingData;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.util.ArrayBuilder;
@@ -271,7 +271,7 @@ abstract static class PipeNode extends PythonBuiltinNode {
         PTuple pipe(@Cached GilNode gil) {
             int[] pipe;
             PythonContext ctx = getContext();
-            SharedContextData sharedData = ctx.getSharedContextData();
+            SharedMultiprocessingData sharedData = ctx.getSharedMultiprocessingData();
             gil.release(true);
             try {
                 pipe = sharedData.pipe();
@@ -291,7 +291,7 @@ public abstract static class WriteNode extends PythonBinaryBuiltinNode {
         Object doWrite(int fd, PBytes data,
                         @CachedLibrary("data") PythonBufferAccessLibrary bufferLib,
                         @Cached GilNode gil) {
-            SharedContextData sharedData = getContext().getSharedContextData();
+            SharedMultiprocessingData sharedData = getContext().getSharedMultiprocessingData();
             gil.release(true);
             try {
                 byte[] bytes = bufferLib.getCopiedByteArray(data);
@@ -322,7 +322,7 @@ public abstract static class ReadNode extends PythonBinaryBuiltinNode {
         @Specialization
         Object doRead(int fd, @SuppressWarnings("unused") Object length,
                         @Cached GilNode gil) {
-            SharedContextData sharedData = getContext().getSharedContextData();
+            SharedMultiprocessingData sharedData = getContext().getSharedMultiprocessingData();
             gil.release(true);
             try {
                 Object data = sharedData.takePipeData(this, fd, () -> {
@@ -350,7 +350,7 @@ public abstract static class CloseNode extends PythonUnaryBuiltinNode {
         @Specialization
         PNone close(@SuppressWarnings("unused") int fd) {
             assert fd < 0;
-            SharedContextData sharedData = getContext().getSharedContextData();
+            SharedMultiprocessingData sharedData = getContext().getSharedMultiprocessingData();
             if (!sharedData.decrementFDRefCount(fd)) {
                 sharedData.closePipe(fd);
             }
@@ -374,7 +374,7 @@ Object doGeneric(VirtualFrame frame, Object rlist,
                         @Cached CastToJavaIntLossyNode castToJava,
                         @Cached GilNode gil) {
             ArrayBuilder<Integer> notEmpty = new ArrayBuilder<>();
-            SharedContextData sharedData = getContext().getSharedContextData();
+            SharedMultiprocessingData sharedData = getContext().getSharedMultiprocessingData();
             gil.release(true);
             try {
                 PSequence pSequence = constructListNode.execute(frame, rlist);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PosixModuleBuiltins.java

@@ -526,7 +526,7 @@ PNone close(VirtualFrame frame, int fd,
                         @CachedLibrary("getPosixSupport()") PosixSupportLibrary posixLib) {
             try {
                 PythonContext ctx = getContext();
-                if (ctx.getSharedContextData().decrementFDRefCount(fd)) {
+                if (ctx.getSharedMultiprocessingData().decrementFDRefCount(fd)) {
                     return PNone.NONE;
                 }
                 posixLib.close(getPosixSupport(), fd);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -468,7 +468,7 @@ public Thread getOwner() {
     public static final String CHILD_CONTEXT_DATA = "childContextData";
     @CompilationFinal private List<Integer> childContextFDs;
     private final ChildContextData childContextData;
-    private final SharedContextData sharedContextData;
+    private final SharedMultiprocessingData sharedMultiprocessingData;
 
     public static final class ChildContextData {
         private int exitCode = 0;
@@ -519,7 +519,7 @@ public boolean compareAndSetExiting(boolean expect, boolean update) {
         }
     }
 
-    public static final class SharedContextData {
+    public static final class SharedMultiprocessingData {
 
         private int fdCounter = 0;
 
@@ -552,7 +552,7 @@ private void incrementFDRefCount(int fd) {
         /**
          * Decreases reference count for the given file descriptor.
          * 
-         * @return {@code true} if ref count was decreased, {@link false} if ref count isn't tracked
+         * @return {@code true} if ref count was decreased, {@code false} if ref count isn't tracked
          *         anymore.
          */
         @TruffleBoundary
@@ -676,7 +676,7 @@ public PythonContext(PythonLanguage language, TruffleLanguage.Env env, Python3Co
         this.core = core;
         this.env = env;
         this.childContextData = (ChildContextData) env.getConfig().get(CHILD_CONTEXT_DATA);
-        this.sharedContextData = this.childContextData == null ? new SharedContextData() : childContextData.parentCtx.sharedContextData;
+        this.sharedMultiprocessingData = this.childContextData == null ? new SharedMultiprocessingData() : childContextData.parentCtx.sharedMultiprocessingData;
         this.handler = new AsyncHandler(this);
         this.sharedFinalizer = new AsyncHandler.SharedFinalizer(this);
         this.optionValues = PythonOptions.createOptionValuesStorage(env);
@@ -706,8 +706,8 @@ public ChildContextData getChildContextData() {
         return childContextData;
     }
 
-    public SharedContextData getSharedContextData() {
-        return sharedContextData;
+    public SharedMultiprocessingData getSharedMultiprocessingData() {
+        return sharedMultiprocessingData;
     }
 
     public long spawnTruffleContext(int fd, int sentinel, int[] fdsToKeep) {
@@ -728,7 +728,7 @@ public long spawnTruffleContext(int fd, int sentinel, int[] fdsToKeep) {
         for (int fdToKeep : fdsToKeep) {
             // prevent file descriptors from being closed when passed to another "process",
             // equivalent to fds_to_keep arg in posix fork_exec
-            getSharedContextData().incrementFDRefCount(fdToKeep);
+            getSharedMultiprocessingData().incrementFDRefCount(fdToKeep);
         }
         start(thread);
         return tid;
@@ -786,7 +786,7 @@ public void run() {
                             LOGGER.log(Level.FINE, t, () -> "exception while closing spawned child context");
                         }
                     }
-                    data.parentCtx.sharedContextData.closePipe(sentinel);
+                    data.parentCtx.sharedMultiprocessingData.closePipe(sentinel);
                 }
             } catch (ThreadDeath td) {
                 // as a result of of TruffleContext.closeCancelled()
@@ -1403,8 +1403,8 @@ public void finalizeContext() {
         }
         cleanupHPyResources();
         for (int fd : getChildContextFDs()) {
-            if (!getSharedContextData().decrementFDRefCount(fd)) {
-                getSharedContextData().closePipe(fd);
+            if (!getSharedMultiprocessingData().decrementFDRefCount(fd)) {
+                getSharedMultiprocessingData().closePipe(fd);
             }
         }
         mainThread = null;