unify socket fds and file fds

Author: timfel

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

@@ -40,14 +40,16 @@
  */
 package com.oracle.graal.python.builtins.objects.socket;
 
+import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.nio.channels.Channel;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 
-public class PSocket extends PythonBuiltinObject {
+public class PSocket extends PythonBuiltinObject implements Channel {
     public static final int AF_UNSPEC = 0;
     public static final int AF_INET = 2;
     public static final int AF_INET6 = 23;
@@ -76,9 +78,7 @@ public class PSocket extends PythonBuiltinObject {
 
     public static final int IPPROTO_TCP = 6;
 
-
     private static final InetSocketAddress EPHEMERAL_ADDRESS = new InetSocketAddress(0);
-    private static Integer nextFd = 0;
 
     private final int family;
     private final int type;
@@ -174,4 +174,14 @@ public boolean isBlocking() {
     public void setBlocking(boolean blocking) {
         this.blocking = blocking;
     }
+
+    public boolean isOpen() {
+        return getSocket() != null && getSocket().isOpen();
+    }
+
+    public void close() throws IOException {
+        if (getSocket() != null) {
+            getSocket().close();
+        }
+    }
 }

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

@@ -77,7 +77,6 @@ public class PosixResources {
     /** Context-local file-descriptor mappings and PID mappings */
     private final SortedMap<Integer, ChannelWrapper> files;
     private final Map<Integer, String> filePaths;
-    private final List<PSocket> sockets;
     private final List<Process> children;
     private final Map<String, Integer> inodes;
     private int inodeCnt = 0;
@@ -272,8 +271,9 @@ public String getFilePath(int fd) {
 
     @TruffleBoundary
     public PSocket getSocket(int fd) {
-        if (sockets.size() > fd) {
-            return sockets.get(fd);
+        ChannelWrapper channelWrapper = files.getOrDefault(fd, null);
+        if (channelWrapper != null && channelWrapper.channel instanceof PSocket) {
+            return (PSocket) channelWrapper.channel;
         }
         return null;
     }
@@ -286,23 +286,16 @@ public void close(int fd) {
         }
     }
 
-    @TruffleBoundary
-    public void closeSocket(int fd) {
-        if (sockets.size() > fd) {
-            sockets.set(fd, null);
-        }
-    }
-
     @TruffleBoundary
     public int openSocket(PSocket socket) {
-        int fd = nextFreeSocketFd();
-        sockets.set(fd, socket);
+        int fd = nextFreeFd();
+        addFD(fd, socket);
         return fd;
     }
 
     @TruffleBoundary
     public void reopenSocket(PSocket socket, int fd) {
-        sockets.set(fd, socket);
+        addFD(fd, socket);
     }
 
     @TruffleBoundary(allowInlining = true)
@@ -380,20 +373,6 @@ private int nextFreeFd() {
         }
     }
 
-    @TruffleBoundary(allowInlining = true)
-    private int nextFreeSocketFd() {
-        synchronized (sockets) {
-            for (int i = 0; i < sockets.size(); i++) {
-                PSocket socket = sockets.get(i);
-                if (socket == null) {
-                    return i;
-                }
-            }
-            sockets.add(null);
-            return sockets.size() - 1;
-        }
-    }
-
     @TruffleBoundary(allowInlining = true)
     public int registerChild(Process child) {
         int pid = nextFreePid();