Fixed detection of posix backend type in PosixResources

Author: otethal

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

@@ -255,7 +255,8 @@ public final class EmulatedPosixSupport extends PosixResources {
     private int currentUmask = 0022;
     private boolean hasDefaultUmask = true;
 
-    public EmulatedPosixSupport(PythonContext context) {
+    public EmulatedPosixSupport(PythonContext context, boolean useNfiForSocketFd) {
+        super(useNfiForSocketFd);
         this.context = context;
         setEnv(context.getEnv());
     }

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

@@ -268,7 +268,7 @@ private static void loadLibrary(NFIPosixSupport posix) {
             try {
                 posix.nfiLibrary = posix.context.getEnv().parseInternal(loadSrc).call();
             } catch (Throwable e) {
-                throw CompilerDirectives.shouldNotReachHere(e);
+                throw CompilerDirectives.shouldNotReachHere("Unable to load native posix support library", e);
             }
         }
 

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

@@ -83,6 +83,7 @@ public class PosixResources extends PosixSupport {
     private final List<Process> children;
     private final Map<String, Integer> inodes;
     private int inodeCnt = 0;
+    private boolean useNfiForSocketFd;
 
     private static class ProcessGroup extends Process {
         private final List<Process> children;
@@ -186,7 +187,7 @@ void setNewChannel(OutputStream outputStream) {
         }
     }
 
-    public PosixResources() {
+    public PosixResources(boolean useNfiForSocketFd) {
         files = Collections.synchronizedSortedMap(new TreeMap<>());
         filePaths = Collections.synchronizedMap(new HashMap<>());
         children = Collections.synchronizedList(new ArrayList<>());
@@ -208,6 +209,7 @@ public PosixResources() {
         children.add(new ProcessGroup(children)); // PID 0 is special, and refers to all processes
                                                   // in the process group
         inodes = new HashMap<>();
+        this.useNfiForSocketFd = useNfiForSocketFd;
     }
 
     @TruffleBoundary
@@ -340,22 +342,23 @@ public void close(int fd) {
 
     @TruffleBoundary
     public int openSocket(PSocket socket, PythonContext context) {
-        Object posixSupport = context.getPosixSupport();
         synchronized (files) {
             int fd;
-            if (posixSupport == this) {
+            if (!useNfiForSocketFd) {
                 // using emulated backend
                 fd = nextFreeFd();
             } else {
                 // using nfi backend
                 try {
+                    Object posixSupport = context.getPosixSupport();
                     PosixSupportLibrary posixLib = PosixSupportLibrary.getUncached();
                     if (nativeFdForSockets == -1) {
                         int[] fds = posixLib.pipe(posixSupport);
-                        posixLib.close(posixSupport, fds[1]);
                         nativeFdForSockets = fds[0];
+                        fd = fds[1];
+                    } else {
+                        fd = posixLib.dup(posixSupport, nativeFdForSockets);
                     }
-                    fd = posixLib.dup(posixSupport, nativeFdForSockets);
                 } catch (PosixException e) {
                     throw CompilerDirectives.shouldNotReachHere("Unable to assign native fd to a socket", e);
                 }
@@ -373,11 +376,10 @@ public void closeSocket(PSocket socket, PythonContext context) {
         }
         socket.setFileno(-1);
         close(fd);
-        Object posixSupport = context.getPosixSupport();
-        if (posixSupport != this) {
+        if (useNfiForSocketFd) {
             // using nfi backend
             try {
-                PosixSupportLibrary.getUncached().close(posixSupport, fd);
+                PosixSupportLibrary.getUncached().close(context.getPosixSupport(), fd);
             } catch (PosixException e) {
                 throw CompilerDirectives.shouldNotReachHere("Unable to close native fd", e);
             }

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

@@ -568,30 +568,30 @@ private void initalizePosixSupport() {
         // The resources field will be removed once all posix builtins go through PosixSupport
         switch (option) {
             case "java":
-                result = resources = new EmulatedPosixSupport(this);
+                result = resources = new EmulatedPosixSupport(this, false);
                 break;
             case "native":
             case "llvm":
                 // TODO this condition will be moved into a factory method in NFIPosixBackend
                 // for now it's here because we still need to expose the emulated backend as
                 // 'resources'
                 if (ImageInfo.inImageBuildtimeCode()) {
-                    EmulatedPosixSupport emulatedPosixSupport = new EmulatedPosixSupport(this);
+                    EmulatedPosixSupport emulatedPosixSupport = new EmulatedPosixSupport(this, false);
                     NFIPosixSupport nativePosixSupport = new NFIPosixSupport(this, option);
                     result = new ImageBuildtimePosixSupport(nativePosixSupport, emulatedPosixSupport);
                     resources = emulatedPosixSupport;
                 } else if (ImageInfo.inImageRuntimeCode()) {
                     NFIPosixSupport nativePosixSupport = new NFIPosixSupport(this, option);
                     result = new ImageBuildtimePosixSupport(nativePosixSupport, null);
-                    resources = new EmulatedPosixSupport(this);
+                    resources = new EmulatedPosixSupport(this, true);
                     resources.setEnv(env);
                 } else {
                     if (!getOption(PythonOptions.RunViaLauncher)) {
                         writeWarning("Native Posix backend is not fully supported when embedding. For example, standard I/O always uses file " +
                                         "descriptors 0, 1 and 2 regardless of stream redirection specified in Truffle environment");
                     }
                     result = new NFIPosixSupport(this, option);
-                    resources = new EmulatedPosixSupport(this);
+                    resources = new EmulatedPosixSupport(this, true);
                     resources.setEnv(env);
                 }
                 break;