[GR-29378] Native implementation of posix.getuid(), getsid(), getppid(), ctermid(), putenv(), execv() and system()

PullRequest: graalpython/1614

Author: otethal

graalpython/com.oracle.graal.python.cext/posix/posix.c

@@ -53,6 +53,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -467,6 +468,43 @@ int32_t call_kill(int64_t pid, int32_t signal) {
     return kill(pid, signal);
 }
 
+int64_t call_getuid() {
+    return getuid();
+}
+
+int64_t call_getppid() {
+    return getppid();
+}
+
+int64_t call_getsid(int64_t pid) {
+    return getsid(pid);
+}
+
+int32_t call_ctermid(char *buf) {
+    return ctermid(buf) == NULL ? -1 : 0;
+}
+
+int32_t call_setenv(char *name, char *value, int overwrite) {
+    return setenv(name, value, overwrite);
+}
+
+// See comment in NFiPosixSupport.execv() for the description of arguments
+void call_execv(char *data, int64_t *offsets, int32_t offsetsLen) {
+    // We reuse the memory allocated for offsets to avoid the need to allocate and reliably free another array
+    char **strings = (char **) offsets;
+    for (int32_t i = 0; i < offsetsLen; ++i) {
+        strings[i] = offsets[i] == -1 ? NULL : data + offsets[i];
+    }
+
+    char *pathname = strings[0];
+    char **argv = strings + 1;
+    execv(pathname, argv);
+}
+
+int32_t call_system(const char *pathname) {
+    return system(pathname);
+}
+
 int32_t get_errno() {
     return errno;
 }

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_os.txt

@@ -100,7 +100,6 @@
 *graalpython.lib-python.3.test.test_os.PathTConverterTests.test_path_t_converter
 *graalpython.lib-python.3.test.test_os.PathTConverterTests.test_path_t_converter_and_custom_class
 *graalpython.lib-python.3.test.test_os.Pep383Tests.test_statvfs
-*graalpython.lib-python.3.test.test_os.PidTests.test_getppid
 *graalpython.lib-python.3.test.test_os.PidTests.test_waitpid_windows
 *graalpython.lib-python.3.test.test_os.PosixUidGidTests.test_setegid
 *graalpython.lib-python.3.test.test_os.PosixUidGidTests.test_seteuid
@@ -157,6 +156,8 @@
 *graalpython.lib-python.3.test.test_os.TestInvalidFD.test_fstat
 *graalpython.lib-python.3.test.test_os.TestInvalidFD.test_fstatvfs
 *graalpython.lib-python.3.test.test_os.TestInvalidFD.test_isatty
+*graalpython.lib-python.3.test.test_os.TestInvalidFD.test_lseek
+*graalpython.lib-python.3.test.test_os.TestInvalidFD.test_read
 *graalpython.lib-python.3.test.test_os.TestInvalidFD.test_readv
 *graalpython.lib-python.3.test.test_os.TestInvalidFD.test_tcgetpgrp
 *graalpython.lib-python.3.test.test_os.TestInvalidFD.test_tcsetpgrpt

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

@@ -55,22 +55,19 @@
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
-import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.FspathNode;
+import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.ObjectToOpaquePathNode;
 import com.oracle.graal.python.builtins.modules.PosixSubprocessModuleBuiltinsClinicProviders.NewForkExecNodeClinicProviderGen;
 import com.oracle.graal.python.builtins.modules.PosixSubprocessModuleBuiltinsFactory.EnvConversionNodeGen;
 import com.oracle.graal.python.builtins.modules.PosixSubprocessModuleBuiltinsFactory.ProcessArgsConversionNodeGen;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.bytes.BytesNodes.ToBytesNode;
-import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes.GetSequenceStorageNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.LenNode;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
-import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
-import com.oracle.graal.python.nodes.PNodeWithRaise;
 import com.oracle.graal.python.nodes.builtins.ListNodes.FastConstructListNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonClinicBuiltinNode;
@@ -79,7 +76,6 @@
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaIntExactNode;
-import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.runtime.PosixSupportLibrary;
 import com.oracle.graal.python.runtime.PosixSupportLibrary.PosixException;
 import com.oracle.graal.python.runtime.PythonContext;
@@ -96,7 +92,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
-import com.oracle.truffle.api.nodes.Node;
 
 @CoreFunctions(defineModule = "_posixsubprocess")
 public class PosixSubprocessModuleBuiltins extends PythonBuiltins {
@@ -105,61 +100,6 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
         return PosixSubprocessModuleBuiltinsFactory.getFactories();
     }
 
-    /**
-     * Helper node that accepts either str or bytes and converts it to a representation specific to
-     * the {@link PosixSupportLibrary} in use. Basically equivalent of
-     * {@code PyUnicode_EncodeFSDefault}.
-     */
-    abstract static class StringOrBytesToOpaquePathNode extends PNodeWithRaise {
-        abstract Object execute(Object obj);
-
-        @Specialization(limit = "1")
-        Object doString(String str,
-                        @CachedContext(PythonLanguage.class) PythonContext context,
-                        @CachedLibrary("context.getPosixSupport()") PosixSupportLibrary posixLib) {
-            return checkPath(posixLib.createPathFromString(context.getPosixSupport(), str));
-        }
-
-        @Specialization(limit = "1")
-        Object doPString(PString pstr,
-                        @Cached CastToJavaStringNode castToJavaStringNode,
-                        @CachedContext(PythonLanguage.class) PythonContext context,
-                        @CachedLibrary("context.getPosixSupport()") PosixSupportLibrary posixLib) {
-            String str = castToJavaStringNode.execute(pstr);
-            return checkPath(posixLib.createPathFromString(context.getPosixSupport(), str));
-        }
-
-        @Specialization(limit = "1")
-        Object doBytes(PBytes bytes,
-                        @Cached ToBytesNode toBytesNode,
-                        @CachedContext(PythonLanguage.class) PythonContext context,
-                        @CachedLibrary("context.getPosixSupport()") PosixSupportLibrary posixLib) {
-            return checkPath(posixLib.createPathFromBytes(context.getPosixSupport(), toBytesNode.execute(bytes)));
-        }
-
-        private Object checkPath(Object path) {
-            if (path == null) {
-                throw raise(ValueError, ErrorMessages.EMBEDDED_NULL_BYTE);
-            }
-            return path;
-        }
-    }
-
-    /**
-     * Similar to {@code PyUnicode_FSConverter}, but the actual conversion is delegated to the
-     * {@link PosixSupportLibrary} implementation.
-     */
-    abstract static class ObjectToOpaquePathNode extends Node {
-        abstract Object execute(VirtualFrame frame, Object obj);
-
-        @Specialization
-        Object doIt(VirtualFrame frame, Object obj,
-                        @Cached FspathNode fspathNode,
-                        @Cached StringOrBytesToOpaquePathNode stringOrBytesToOpaquePathNode) {
-            return stringOrBytesToOpaquePathNode.execute(fspathNode.call(frame, obj));
-        }
-    }
-
     /**
      * Helper converter which iterates the argv argument and converts each element to the opaque
      * path representation used by {@link PosixSupportLibrary}.

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

@@ -62,6 +62,7 @@ public abstract class ErrorMessages {
     public static final String ARG_MUST_BE_STRING_OR_NUMBER = "%s argument must be a string or a number, not '%p'";
     public static final String ARG_MUST_BE_UNICODE = "%s argument %d must be a unicode character, not %p";
     public static final String ARG_MUST_NOT_BE_ZERO = "%s arg %d must not be zero";
+    public static final String ARG_MUST_NOT_BE_EMPTY = "%s arg %d must not be empty";
     public static final String ARG_NOT_IN_RANGE = "%s arg not in range(%s)";
     public static final String ARG_SHOULD_BE_INT_BYTESLIKE_OBJ = "argument should be integer or bytes-like object, not '%p'";
     public static final String ARG_SHOULD_BE_INT_OR_NONE = "argument should be integer or None, not %p";
@@ -293,6 +294,7 @@ public abstract class ErrorMessages {
     public static final String IF_YOU_GIVE_ONLY_ONE_ARG_TO_DICT = "if you give only one argument to maketrans it must be a dict";
     public static final String INVALID_INDEXING_OF_0_DIM_MEMORY = "invalid indexing of 0-dim memory";
     public static final String ILLEGAL_ARG = "illegal argument";
+    public static final String ILLEGAL_ENVIRONMENT_VARIABLE_NAME = "illegal environment variable name";
     public static final String ILLEGAL_EXPRESSION_FOR_AUGMENTED_ASSIGNEMNT = "illegal expression for augmented assignment";
     public static final String ILLEGAL_IP_STRING_PASSED_TO = "illegal IP address string passed to %s";
     public static final String ILLEGAL_SOCKET_ADDR_ARG = "%s: illegal sockaddr argument";