Pulled up the context field from EmulatedPosixSupport to PosixResources

Author: otethal

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

@@ -285,7 +285,7 @@ Object socket(VirtualFrame frame, Object cls, Object family, Object type, Object
         private Object createSocketInternal(Object cls, int family, int type, int proto) {
             if (getContext().getEnv().isNativeAccessAllowed()) {
                 PSocket newSocket = factory().createSocket(cls, family, type, proto);
-                int fd = getContext().getResources().openSocket(newSocket, getContext());
+                int fd = getContext().getResources().openSocket(newSocket);
                 newSocket.setFileno(fd);
                 return newSocket;
             } else {
@@ -680,7 +680,7 @@ Object close(VirtualFrame frame, int fd) {
             } catch (IOException e) {
                 throw raiseOSError(frame, OSErrorEnum.EBADF);
             }
-            getContext().getResources().closeSocket(socket, getContext());
+            getContext().getResources().closeSocket(socket);
             return PNone.NONE;
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/socket/SocketBuiltins.java

@@ -137,7 +137,7 @@ Object accept(PSocket socket) {
                     throw raise(OSError);
                 }
                 PSocket newSocket = factory().createSocket(socket.getFamily(), socket.getType(), socket.getProto());
-                int fd = getContext().getResources().openSocket(newSocket, getContext());
+                int fd = getContext().getResources().openSocket(newSocket);
                 newSocket.setFileno(fd);
                 newSocket.setSocket(acceptSocket);
                 SocketUtils.setBlocking(newSocket, socket.isBlocking());
@@ -191,7 +191,7 @@ Object close(PSocket socket) {
                     throw raise(OSError, ErrorMessages.BAD_FILE_DESCRIPTOR);
                 }
             }
-            getContext().getResources().closeSocket(socket, getContext());
+            getContext().getResources().closeSocket(socket);
             return PNone.NONE;
         }
     }

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

@@ -250,14 +250,12 @@ public final class EmulatedPosixSupport extends PosixResources {
     private static final int S_IFDIR = 0040000;
     private static final int S_IFREG = 0100000;
 
-    private final PythonContext context;
     private final ConcurrentHashMap<String, String> environ = new ConcurrentHashMap<>();
     private int currentUmask = 0022;
     private boolean hasDefaultUmask = true;
 
     public EmulatedPosixSupport(PythonContext context, boolean useNfiForSocketFd) {
-        super(useNfiForSocketFd);
-        this.context = context;
+        super(context, useNfiForSocketFd);
         setEnv(context.getEnv());
     }
 

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

@@ -78,12 +78,13 @@ public class PosixResources extends PosixSupport {
     private static final int FD_STDERR = 2;
 
     /** Context-local file-descriptor mappings and PID mappings */
+    protected final PythonContext context;
     private final SortedMap<Integer, ChannelWrapper> files;
     protected final Map<Integer, String> filePaths;
     private final List<Process> children;
     private final Map<String, Integer> inodes;
     private int inodeCnt = 0;
-    private boolean useNfiForSocketFd;
+    private final boolean useNfiForSocketFd;
 
     private static class ProcessGroup extends Process {
         private final List<Process> children;
@@ -187,7 +188,8 @@ void setNewChannel(OutputStream outputStream) {
         }
     }
 
-    public PosixResources(boolean useNfiForSocketFd) {
+    public PosixResources(PythonContext context, boolean useNfiForSocketFd) {
+        this.context = context;
         files = Collections.synchronizedSortedMap(new TreeMap<>());
         filePaths = Collections.synchronizedMap(new HashMap<>());
         children = Collections.synchronizedList(new ArrayList<>());
@@ -341,7 +343,7 @@ public void close(int fd) {
     private int nativeFdForSockets = -1;
 
     @TruffleBoundary
-    public int openSocket(PSocket socket, PythonContext context) {
+    public int openSocket(PSocket socket) {
         synchronized (files) {
             int fd;
             if (!useNfiForSocketFd) {
@@ -369,7 +371,7 @@ public int openSocket(PSocket socket, PythonContext context) {
     }
 
     @TruffleBoundary
-    public void closeSocket(PSocket socket, PythonContext context) {
+    public void closeSocket(PSocket socket) {
         int fd = socket.getFileno();
         if (fd < 0) {
             return;