[GR-15827] Implemetation of os.execv and os.execl + adding one external dependency file

PullRequest: graalpython/521

Author: Franziska Geiger

graalpython/com.oracle.graal.python.cext/include/Python.h

@@ -120,6 +120,7 @@
 #include "funcobject.h"
 #include "iterobject.h"
 #include "datetime.h"
+#include "typeslots.h"
 
 // TODO: we must extend the refcounting behavior to support handles to managed objects
 #undef Py_DECREF

graalpython/com.oracle.graal.python.cext/include/typeslots.h

@@ -0,0 +1,90 @@
+/* Copyright (c) 2018, 2019, Oracle and/or its affiliates.
+ * Copyright (C) 1996-2017 Python Software Foundation
+ *
+ * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ */
+/* Do not renumber the file; these numbers are part of the stable ABI. */
+/* Disabled, see #10181 */
+#undef Py_bf_getbuffer
+#undef Py_bf_releasebuffer
+#define Py_mp_ass_subscript 3
+#define Py_mp_length 4
+#define Py_mp_subscript 5
+#define Py_nb_absolute 6
+#define Py_nb_add 7
+#define Py_nb_and 8
+#define Py_nb_bool 9
+#define Py_nb_divmod 10
+#define Py_nb_float 11
+#define Py_nb_floor_divide 12
+#define Py_nb_index 13
+#define Py_nb_inplace_add 14
+#define Py_nb_inplace_and 15
+#define Py_nb_inplace_floor_divide 16
+#define Py_nb_inplace_lshift 17
+#define Py_nb_inplace_multiply 18
+#define Py_nb_inplace_or 19
+#define Py_nb_inplace_power 20
+#define Py_nb_inplace_remainder 21
+#define Py_nb_inplace_rshift 22
+#define Py_nb_inplace_subtract 23
+#define Py_nb_inplace_true_divide 24
+#define Py_nb_inplace_xor 25
+#define Py_nb_int 26
+#define Py_nb_invert 27
+#define Py_nb_lshift 28
+#define Py_nb_multiply 29
+#define Py_nb_negative 30
+#define Py_nb_or 31
+#define Py_nb_positive 32
+#define Py_nb_power 33
+#define Py_nb_remainder 34
+#define Py_nb_rshift 35
+#define Py_nb_subtract 36
+#define Py_nb_true_divide 37
+#define Py_nb_xor 38
+#define Py_sq_ass_item 39
+#define Py_sq_concat 40
+#define Py_sq_contains 41
+#define Py_sq_inplace_concat 42
+#define Py_sq_inplace_repeat 43
+#define Py_sq_item 44
+#define Py_sq_length 45
+#define Py_sq_repeat 46
+#define Py_tp_alloc 47
+#define Py_tp_base 48
+#define Py_tp_bases 49
+#define Py_tp_call 50
+#define Py_tp_clear 51
+#define Py_tp_dealloc 52
+#define Py_tp_del 53
+#define Py_tp_descr_get 54
+#define Py_tp_descr_set 55
+#define Py_tp_doc 56
+#define Py_tp_getattr 57
+#define Py_tp_getattro 58
+#define Py_tp_hash 59
+#define Py_tp_init 60
+#define Py_tp_is_gc 61
+#define Py_tp_iter 62
+#define Py_tp_iternext 63
+#define Py_tp_methods 64
+#define Py_tp_new 65
+#define Py_tp_repr 66
+#define Py_tp_richcompare 67
+#define Py_tp_setattr 68
+#define Py_tp_setattro 69
+#define Py_tp_str 70
+#define Py_tp_traverse 71
+#define Py_tp_members 72
+#define Py_tp_getset 73
+#define Py_tp_free 74
+#define Py_nb_matrix_multiply 75
+#define Py_nb_inplace_matrix_multiply 76
+#define Py_am_await 77
+#define Py_am_aiter 78
+#define Py_am_anext 79
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
+/* New in 3.5 */
+#define Py_tp_finalize 80
+#endif

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -41,6 +41,7 @@
 
 
 class PosixTests(unittest.TestCase):
+
     def test_uname(self):
         # just like cpython, a simple smoke test
         import posix
@@ -51,3 +52,44 @@ def test_uname(self):
         self.assertIsNotNone(uname.release)
         self.assertIsNotNone(uname.version)
         self.assertIsNotNone(uname.machine)
+
+    def test_execv(self):
+        # test creates a shell script, which again creates a file, to ensure script execution
+        # Both files are deleted again in the end
+        import os
+        import sys
+        new_file_path, cwd = self.create_file()
+        # os.execv(new_file_path, [new_file_path, 'the_input'])
+        os.system("%s -c \"import os; os.execv('%s', ['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
+        assert os.path.isfile(cwd + '/test.txt')
+        self.delete_file(new_file_path, cwd)
+
+    def test_execl(self):
+        # test creates a shell script, which again creates a file, to ensure script execution
+        # Both files are deleted again in the end
+        import os
+        import sys
+        new_file_path, cwd = self.create_file()
+        # os.execl(new_file_path, [new_file_path, 'the_input'])
+        os.system("%s -c \"import os; os.execl('%s', *['%s', 'the_input'])\"" % (sys.executable, new_file_path, new_file_path))
+        assert os.path.isfile(cwd + '/test.txt')
+        self.delete_file(new_file_path, cwd)
+
+    def create_file(self):
+        import os
+        import stat
+        cwd = os.getcwd()
+        new_file_path = os.path.join(cwd , 'myscript.sh')
+        with open(new_file_path, 'w') as script:
+            script.write('#!/bin/sh\n')
+            script.write("echo \"something echo with\" $1 > {}/test.txt\n".format(cwd))
+            script.write('echo this is an output\n')
+        assert os.path.isfile(new_file_path)
+        st = os.stat(new_file_path)
+        os.chmod(new_file_path, st.st_mode | stat.S_IEXEC)
+        return new_file_path, cwd
+
+    def delete_file(self, new_file_path, cwd):
+        import os
+        os.remove(new_file_path)
+        os.remove(cwd + '/test.txt')

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

@@ -49,8 +49,10 @@
 import static com.oracle.truffle.api.TruffleFile.UNIX_PERMISSIONS;
 import static com.oracle.truffle.api.TruffleFile.UNIX_UID;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.lang.ProcessBuilder.Redirect;
@@ -105,13 +107,15 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes.LenNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemDynamicNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.ToByteArrayNode;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum;
 import com.oracle.graal.python.builtins.objects.floats.PFloat;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
@@ -136,6 +140,7 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.exception.PythonExitException;
+import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -283,6 +288,69 @@ public void postInitialize(PythonCore core) {
         ((PDict) environAttr).setDictStorage(environ.getDictStorage());
     }
 
+    @Builtin(name = "execv", minNumOfPositionalArgs = 2)
+    @GenerateNodeFactory
+    public abstract static class ExecvNode extends PythonBuiltinNode {
+
+        @Specialization
+        Object execute(String path, PList args) {
+            return doExecute(path, args);
+        }
+
+        @Specialization
+        Object execute(PString path, PTuple args) {
+            return execute(path.getValue(), args);
+        }
+
+        @Specialization
+        Object execute(String path, PTuple args) {
+            // in case of execl the PList happens to be in the tuples first entry
+            Object list = GetItemDynamicNode.getUncached().execute(args.getSequenceStorage(), 0);
+            return doExecute(path, list instanceof PList ? (PList) list : args);
+        }
+
+        @Specialization
+        Object execute(PString path, PList args) {
+            return doExecute(path.getValue(), args);
+        }
+
+        @TruffleBoundary
+        Object doExecute(String path, PSequence args) {
+            try {
+                if (!getContext().isExecutableAccessAllowed()) {
+                    throw raise(OSError, "executable access denied");
+                }
+                int size = args.getSequenceStorage().length();
+                String[] cmd = new String[size];
+                // We don't need the path variable because it's already in the array
+                // but I need to process it for CI gate
+                cmd[0] = path;
+                for (int i = 0; i < size; i++) {
+                    cmd[i] = GetItemDynamicNode.getUncached().execute(args.getSequenceStorage(), i).toString();
+                }
+                Runtime rt = Runtime.getRuntime();
+                Process pr = rt.exec(cmd);
+                // retrieve output from executed script
+                BufferedReader bfr = new BufferedReader(new InputStreamReader(pr.getInputStream()));
+                OutputStream stream = getContext().getEnv().out();
+                String line = "";
+                while ((line = bfr.readLine()) != null) {
+                    stream.write(line.getBytes());
+                }
+
+                try {
+                    pr.waitFor();
+                } catch (InterruptedException e) {
+                    throw new IOException(e);
+                }
+
+                throw new PythonExitException(this, pr.exitValue());
+            } catch (IOException e) {
+                throw raise(PythonErrorType.ValueError, "Could not execute script '%s'", e.getMessage());
+            }
+        }
+    }
+
     @Builtin(name = "getcwd", minNumOfPositionalArgs = 0)
     @GenerateNodeFactory
     public abstract static class CwdNode extends PythonBuiltinNode {

graalpython/lib-graalpython/posix.py

@@ -143,3 +143,9 @@ def uname():
 @__builtin__
 def get_terminal_size(fd = None):
     return terminal_size(old_get_terminal_size(fd))
+
+def execl(file, *args):
+    """execl(file, *args)
+    Execute the executable file with argument list args, replacing the
+    current process. """
+    execv(file, args)

mx.graalpython/copyrights/overrides

@@ -100,6 +100,7 @@ graalpython/com.oracle.graal.python.cext/include/structseq.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/traceback.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/truffle.h,no.copyright
 graalpython/com.oracle.graal.python.cext/include/tupleobject.h,python.copyright
+graalpython/com.oracle.graal.python.cext/include/typeslots.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/ucnhash.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/unicodeobject.h,python.copyright
 graalpython/com.oracle.graal.python.cext/include/warnings.h,python.copyright
@@ -520,3 +521,4 @@ mx.graalpython/mx_graalpython.py,zippy.copyright
 mx.graalpython/mx_graalpython_bench_param.py,zippy.copyright
 mx.graalpython/mx_graalpython_benchmark.py,zippy.copyright
 mx.graalpython/suite.py,no.copyright
+