intrinsified lib-graalpython/sys_post_init.py

Author: tomasstupka

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

@@ -135,17 +135,6 @@ def test_recursive_import_from():
         import package.recpkg
         assert package.recpkg.context is package.recpkg.reduction.context
 
-
-if sys.implementation.name == "graalpython":
-    def test_imp_cached_imports():
-        import _imp
-
-        finder = _imp.CachedImportFinder
-
-        spec = finder.find_spec("encodings", None)
-        assert spec.submodule_search_locations
-
-
 def test_import_package_all() :
     import package1
     expected_syms = ["moduleX", "lib1_hello", "lib1_world"]

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -246,11 +246,9 @@
 import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
 import com.oracle.graal.python.builtins.objects.zipimporter.ZipImporterBuiltins;
-import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectLookupAttr;
 import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.call.GenericInvokeNode;
-import com.oracle.graal.python.nodes.statement.AbstractImportNode;
 import com.oracle.graal.python.runtime.PythonCodeSerializer;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
@@ -314,10 +312,6 @@ private static String[] initializeCoreFiles() {
                         "zipimport",
                         "mmap",
                         "java",
-                        // TODO: see the encodings initialization before sys_post_init.py is
-                        // loaded in initializePython3Core;
-                        // once sys_post_init.py is gone, it should not be necessary
-                        "sys_post_init",
                         "_contextvars",
                         "pip_hook",
                         "_struct",
@@ -660,26 +654,11 @@ private void initializeJavaCore() {
     private void initializePython3Core(String coreHome) {
         loadFile(BuiltinNames.BUILTINS, coreHome);
         for (String s : coreFiles) {
-            // TODO: once sys_post_init.py is gone, this should not be necessary
-            if (s.equals("sys_post_init")) {
-                importEncoding();
-            }
             loadFile(s, coreHome);
         }
         initialized = true;
     }
 
-    private void importEncoding() {
-        PythonModule sys = lookupBuiltinModule("sys");
-        Object sysPath = sys.getAttribute("path");
-        PyObjectCallMethodObjArgs.getUncached().execute(null, sysPath, "insert", 0, getContext().getStdlibHome());
-        try {
-            AbstractImportNode.importModule("encodings");
-        } finally {
-            PyObjectCallMethodObjArgs.getUncached().execute(null, sysPath, "pop");
-        }
-    }
-
     /**
      * Run post-initialization code that needs a fully working Python environment. This will be run
      * eagerly when the context is initialized on the JVM or a new context is created on SVM, but is

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

@@ -217,6 +217,16 @@ public void postInitialize(Python3Core core) {
         }
     }
 
+    @TruffleBoundary
+    String getStdIOEncoding() {
+        return (String) builtinConstants.get("stdio_encoding");
+    }
+
+    @TruffleBoundary
+    String getStdIOError() {
+        return (String) builtinConstants.get("stdio_error");
+    }
+
     /**
      * Entry point for executing a path using the launcher, e.g. {@code python foo.py}
      */

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

@@ -62,8 +62,14 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.modules.SysModuleBuiltinsClinicProviders.GetFrameNodeClinicProviderGen;
+import com.oracle.graal.python.builtins.modules.io.BufferedReaderBuiltins;
+import com.oracle.graal.python.builtins.modules.io.BufferedWriterBuiltins;
 import com.oracle.graal.python.builtins.modules.io.FileIOBuiltins;
+import com.oracle.graal.python.builtins.modules.io.PBuffered;
 import com.oracle.graal.python.builtins.modules.io.PFileIO;
+import com.oracle.graal.python.builtins.modules.io.PTextIO;
+import com.oracle.graal.python.builtins.modules.io.TextIOWrapperNodes.TextIOWrapperInitNode;
+import com.oracle.graal.python.builtins.modules.io.TextIOWrapperNodesFactory.TextIOWrapperInitNodeGen;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.frame.PFrame;
@@ -73,6 +79,7 @@
 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.namespace.PSimpleNamespace;
+import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.str.StringNodes;
 import com.oracle.graal.python.builtins.objects.traceback.GetTracebackNode;
@@ -81,6 +88,7 @@
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.StructSequence;
 import com.oracle.graal.python.lib.PyNumberAsSizeNode;
+import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode.NoAttributeHandler;
@@ -92,6 +100,7 @@
 import com.oracle.graal.python.nodes.function.builtins.clinic.ArgumentClinicProvider;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.util.ExceptionStateNodes.GetCaughtExceptionNode;
+import com.oracle.graal.python.runtime.PosixSupportLibrary;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -113,6 +122,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
+import java.util.Map;
 
 @CoreFunctions(defineModule = "sys", isEager = true)
 public class SysModuleBuiltins extends PythonBuiltins {
@@ -398,11 +408,10 @@ public void initialize(Python3Core core) {
         super.initialize(core);
 
         // we need these during core initialization, they are re-set in postInitialize
-        postInitialize(core);
+        postInitialize0(core);
     }
 
-    @Override
-    public void postInitialize(Python3Core core) {
+    public void postInitialize0(Python3Core core) {
         super.postInitialize(core);
         PythonModule sys = core.lookupBuiltinModule("sys");
         PythonContext context = core.getContext();
@@ -488,6 +497,74 @@ public void postInitialize(Python3Core core) {
         ));
     }
 
+    @Override
+    public void postInitialize(Python3Core core) {
+        postInitialize0(core);
+        initStd(core);
+    }
+
+    @TruffleBoundary
+    public void initStd(Python3Core core) {
+        TextIOWrapperInitNode textIOWrapperInitNode = TextIOWrapperInitNodeGen.getUncached();
+        PythonObjectFactory factory = PythonObjectFactory.getUncached();
+
+        // wrap std in/out/err
+        GraalPythonModuleBuiltins gp = (GraalPythonModuleBuiltins) core.lookupBuiltinModule("__graalpython__").getBuiltins();
+        String stdioEncoding = gp.getStdIOEncoding();
+        String stdioError = gp.getStdIOError();
+        Object posixSupport = core.getContext().getPosixSupport();
+        PosixSupportLibrary posixLib = PosixSupportLibrary.getUncached();
+        PythonModule sysModule = core.lookupBuiltinModule("sys");
+
+        PBuffered reader = factory.createBufferedReader(PythonBuiltinClassType.PBufferedReader);
+        BufferedReaderBuiltins.BufferedReaderInit.internalInit(reader, (PFileIO) get(builtinConstants, "stdin"), BufferedReaderBuiltins.DEFAULT_BUFFER_SIZE, factory, posixSupport,
+                        posixLib);
+        setWrapper("stdin", "__stdin__", "r", stdioEncoding, stdioError, reader, sysModule, textIOWrapperInitNode, core.factory());
+
+        PBuffered writer = factory.createBufferedWriter(PythonBuiltinClassType.PBufferedWriter);
+        BufferedWriterBuiltins.BufferedWriterInit.internalInit(writer, (PFileIO) get(builtinConstants, "stdout"), BufferedReaderBuiltins.DEFAULT_BUFFER_SIZE, factory, posixSupport,
+                        posixLib);
+        PTextIO stdout = setWrapper("stdout", "__stdout__", "w", stdioEncoding, stdioError, writer, sysModule, textIOWrapperInitNode, core.factory());
+
+        writer = factory.createBufferedWriter(PythonBuiltinClassType.PBufferedWriter);
+        BufferedWriterBuiltins.BufferedWriterInit.internalInit(writer, (PFileIO) get(builtinConstants, "stderr"), BufferedReaderBuiltins.DEFAULT_BUFFER_SIZE, factory, posixSupport,
+                        posixLib);
+        PTextIO stderr = setWrapper("stderr", "__stderr__", "w", stdioEncoding, "backslashreplace", writer, sysModule, textIOWrapperInitNode, core.factory());
+
+        // register atexit close std out/err
+        core.getContext().registerAtexitHook((ctx) -> {
+            callClose(stdout);
+            callClose(stderr);
+        });
+    }
+
+    private static Object get(Map<Object, Object> builtinConstants, Object key) {
+        return builtinConstants.get(key);
+    }
+
+    private static PTextIO setWrapper(String name, String specialName, String mode, String encoding, String error, PBuffered buffered, PythonModule sysModule,
+                    TextIOWrapperInitNode textIOWrapperInitNode, PythonObjectFactory factory) {
+        PTextIO textIOWrapper = factory.createTextIO(PythonBuiltinClassType.PTextIOWrapper);
+        textIOWrapperInitNode.execute(null, textIOWrapper, buffered, encoding, error, PNone.NONE, true, true);
+
+        setAttribute(textIOWrapper, "mode", mode);
+        setAttribute(sysModule, name, textIOWrapper);
+        setAttribute(sysModule, specialName, textIOWrapper);
+
+        return textIOWrapper;
+    }
+
+    private static void setAttribute(PythonObject obj, String key, Object value) {
+        obj.setAttribute(key, value);
+    }
+
+    private static void callClose(Object obj) {
+        try {
+            PyObjectCallMethodObjArgs.getUncached().execute(null, obj, "close");
+        } catch (PException e) {
+        }
+    }
+
     @Builtin(name = "exc_info", needsFrame = true)
     @GenerateNodeFactory
     public abstract static class ExcInfoNode extends PythonBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/io/AbstractBufferedIOBuiltins.java

@@ -74,7 +74,7 @@
 
 abstract class AbstractBufferedIOBuiltins extends PythonBuiltins {
 
-    protected static final int DEFAULT_BUFFER_SIZE = IOModuleBuiltins.DEFAULT_BUFFER_SIZE;
+    public static final int DEFAULT_BUFFER_SIZE = IOModuleBuiltins.DEFAULT_BUFFER_SIZE;
 
     public abstract static class BufferedInitNode extends PNodeWithRaise {
 

graalpython/lib-graalpython/final_patches.py

@@ -40,6 +40,16 @@
 import _imp
 import sys
 
+# - make sure encodings gets frozen in scope of _imp.cache_all_file_modules
+# - at this point during context startup, sys.path isn't initialized, 
+#   so we need to set it up
+sys.path.append(__graalpython__.stdlib_home)
+try:
+    import encodings
+finally:
+    assert len(sys.path) == 1
+    sys.path.pop()
+    
 _imp.cache_all_file_modules()
 
 from importlib._bootstrap import BuiltinImporter