[GR-26827] Fixed file descriptor leaks by closing Selector

PullRequest: graalpython/1339

Author: otethal

graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py

@@ -208,7 +208,7 @@ def parse_unittest_output(output):
 
             # n.b.: we add a '*' in the front, so that unittests doesn't add
             # its own asterisks, because now this is already a pattern
-            for funcname, classname, result in parse_unittest_output(stderr):
+            for funcname, classname, result in parse_unittest_output(p.stderr):
                 # We consider skipped tests as passing in order to avoid a situation where a Linux run
                 # untags a Darwin-only test and vice versa
                 if result == 'ok' or result.startswith('skipped'):

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

@@ -1449,13 +1449,8 @@ PTuple waitpid(VirtualFrame frame, int pid, int options) {
                     int exitStatus = getResources().waitpid(pid);
                     return factory().createTuple(new Object[]{pid, exitStatus});
                 } else if (options == WNOHANG) {
-                    int exitStatus = getResources().exitStatus(pid);
-                    if (exitStatus == Integer.MIN_VALUE) {
-                        // not terminated, yet, we should return 0
-                        return factory().createTuple(new Object[]{0, 0});
-                    } else {
-                        return factory().createTuple(new Object[]{pid, exitStatus});
-                    }
+                    int[] res = getResources().exitStatus(pid);
+                    return factory().createTuple(new Object[]{res[0], res[1]});
                 } else {
                     throw raise(PythonBuiltinClassType.NotImplementedError, "Only 0 or WNOHANG are supported for waitpid");
                 }

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

@@ -164,56 +164,57 @@ PTuple doGeneric(VirtualFrame frame, Object rlist, Object wlist, Object xlist, O
 
         @TruffleBoundary
         private static void doSelect(ChannelFD[] readFDs, ChannelFD[] writeFDs, ChannelFD[] xFDs, long timeoutMillis) throws IOException {
-            Selector selector = Selector.open();
+            try (Selector selector = Selector.open()) {
 
-            for (ChannelFD readFD : readFDs) {
-                readFD.channel.configureBlocking(false);
-                readFD.channel.register(selector, SelectionKey.OP_READ);
-            }
+                for (ChannelFD readFD : readFDs) {
+                    readFD.channel.configureBlocking(false);
+                    readFD.channel.register(selector, SelectionKey.OP_READ);
+                }
 
-            for (ChannelFD writeFD : writeFDs) {
-                writeFD.channel.configureBlocking(false);
-                writeFD.channel.register(selector, SelectionKey.OP_WRITE);
-            }
+                for (ChannelFD writeFD : writeFDs) {
+                    writeFD.channel.configureBlocking(false);
+                    writeFD.channel.register(selector, SelectionKey.OP_WRITE);
+                }
 
-            for (ChannelFD xFD : xFDs) {
-                // TODO(fa): not sure if these ops are representing
-                // "exceptional condition pending"
-                xFD.channel.configureBlocking(false);
-                xFD.channel.register(selector, SelectionKey.OP_ACCEPT | SelectionKey.OP_CONNECT);
-            }
+                for (ChannelFD xFD : xFDs) {
+                    // TODO(fa): not sure if these ops are representing
+                    // "exceptional condition pending"
+                    xFD.channel.configureBlocking(false);
+                    xFD.channel.register(selector, SelectionKey.OP_ACCEPT | SelectionKey.OP_CONNECT);
+                }
 
-            int selected = selector.select(timeoutMillis);
+                int selected = selector.select(timeoutMillis);
 
-            // remove non-selected channels from given lists
-            int deleted = 0;
-            for (int i = 0; i < readFDs.length; i++) {
-                ChannelFD readFD = readFDs[i];
-                SelectionKey selectionKey = readFD.channel.keyFor(selector);
-                if (!selectionKey.isReadable()) {
-                    readFDs[i] = null;
-                    deleted++;
+                // remove non-selected channels from given lists
+                int deleted = 0;
+                for (int i = 0; i < readFDs.length; i++) {
+                    ChannelFD readFD = readFDs[i];
+                    SelectionKey selectionKey = readFD.channel.keyFor(selector);
+                    if (!selectionKey.isReadable()) {
+                        readFDs[i] = null;
+                        deleted++;
+                    }
                 }
-            }
 
-            for (int i = 0; i < writeFDs.length; i++) {
-                ChannelFD writeFD = writeFDs[i];
-                SelectionKey selectionKey = writeFD.channel.keyFor(selector);
-                if (!selectionKey.isWritable()) {
-                    writeFDs[i] = null;
-                    deleted++;
+                for (int i = 0; i < writeFDs.length; i++) {
+                    ChannelFD writeFD = writeFDs[i];
+                    SelectionKey selectionKey = writeFD.channel.keyFor(selector);
+                    if (!selectionKey.isWritable()) {
+                        writeFDs[i] = null;
+                        deleted++;
+                    }
                 }
-            }
 
-            for (int i = 0; i < xFDs.length; i++) {
-                ChannelFD xFD = xFDs[i];
-                SelectionKey selectionKey = xFD.channel.keyFor(selector);
-                if (!(selectionKey.isAcceptable() || selectionKey.isConnectable())) {
-                    xFDs[i] = null;
-                    deleted++;
+                for (int i = 0; i < xFDs.length; i++) {
+                    ChannelFD xFD = xFDs[i];
+                    SelectionKey selectionKey = xFD.channel.keyFor(selector);
+                    if (!(selectionKey.isAcceptable() || selectionKey.isConnectable())) {
+                        xFDs[i] = null;
+                        deleted++;
+                    }
                 }
+                assert selected == (readFDs.length + writeFDs.length + xFDs.length) - deleted;
             }
-            assert selected == (readFDs.length + writeFDs.length + xFDs.length) - deleted;
         }
 
         private ChannelFD[] seq2set(VirtualFrame frame, Object sequence, PythonObjectLibrary sequenceLib, PythonObjectLibrary itemLib, LookupAndCallBinaryNode callGetItemNode,

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

@@ -458,13 +458,23 @@ public int waitpid(int pid) throws IndexOutOfBoundsException, InterruptedExcepti
     }
 
     @TruffleBoundary(allowInlining = true)
-    public int exitStatus(int pid) throws IndexOutOfBoundsException {
-        Process process = getChild(pid);
-        if (process.isAlive()) {
-            return Integer.MIN_VALUE;
+    public int[] exitStatus(int pid) throws IndexOutOfBoundsException {
+        if (pid == -1) {
+            for (int childPid = 1; childPid < children.size(); ++childPid) {
+                Process child = children.get(childPid);
+                if (child != null && !child.isAlive()) {
+                    children.set(childPid, null);
+                    return new int[]{childPid, child.exitValue()};
+                }
+            }
         } else {
-            return process.exitValue();
+            Process process = getChild(pid);
+            if (!process.isAlive()) {
+                children.set(pid, null);
+                return new int[]{pid, process.exitValue()};
+            }
         }
+        return new int[]{0, 0};
     }
 
     @TruffleBoundary(allowInlining = true)