[GR-24931] Move the initial site.py import to the context initialization.

PullRequest: graalpython/1129

Author: entlicher

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -175,7 +175,7 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                 case "-debug-java":
                     if (wantsExperimental) {
                         if (!isAOT()) {
-                            subprocessArgs.add("Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=y");
+                            subprocessArgs.add("agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=y");
                             inputArgs.remove("-debug-java");
                         }
                     } else {
@@ -401,6 +401,9 @@ protected void launch(Builder contextBuilder) {
         contextBuilder.option("python.QuietFlag", Boolean.toString(quietFlag));
         contextBuilder.option("python.NoUserSiteFlag", Boolean.toString(noUserSite));
         contextBuilder.option("python.NoSiteFlag", Boolean.toString(noSite));
+        if (!noSite) {
+            contextBuilder.option("python.ForceImportSite", "true");
+        }
         contextBuilder.option("python.IgnoreEnvironmentFlag", Boolean.toString(ignoreEnv));
         contextBuilder.option("python.UnbufferedIO", Boolean.toString(unbufferedIO));
 
@@ -424,9 +427,6 @@ protected void launch(Builder contextBuilder) {
                     print("Type \"help\", \"copyright\", \"credits\" or \"license\" for more information.");
                 }
             }
-            if (!noSite) {
-                evalInternal(context, "import site\n");
-            }
             if (!quietFlag && stdinIsInteractive) {
                 System.err.println("Please note: This Python implementation is in the very early stages, " +
                                 "and can run little more than basic benchmarks at this point.");
@@ -823,7 +823,7 @@ static List<String> getCmdline(List<String> args, List<String> subProcessDefs) {
             cmd.add("-cp");
             cmd.add(ManagementFactory.getRuntimeMXBean().getClassPath());
             for (String subProcArg : subProcessDefs) {
-                assert subProcArg.startsWith("D") || subProcArg.startsWith("X");
+                assert subProcArg.startsWith("D") || subProcArg.startsWith("agent");
                 cmd.add("-" + subProcArg);
             }
             cmd.add(GraalPythonMain.class.getName());

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

@@ -96,6 +96,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.profiles.BranchProfile;
+import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.utilities.CyclicAssumption;
 
 public final class PythonContext {
@@ -375,12 +376,23 @@ public void initialize() {
         core.initialize(this);
         setupRuntimeInformation(false);
         core.postInitialize();
+        if (!ImageInfo.inImageBuildtimeCode()) {
+            importSiteIfForced();
+        }
     }
 
     public void patch(Env newEnv) {
         setEnv(newEnv);
         setupRuntimeInformation(true);
         core.postInitialize();
+        importSiteIfForced();
+    }
+
+    private void importSiteIfForced() {
+        if (getOption(PythonOptions.ForceImportSite)) {
+            CallTarget site = env.parsePublic(Source.newBuilder(PythonLanguage.ID, "import site\n", "<internal>").internal(true).build());
+            site.call();
+        }
     }
 
     /**

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

@@ -153,6 +153,9 @@ private PythonOptions() {
     @EngineOption @Option(category = OptionCategory.EXPERT, help = "") //
     public static final OptionKey<Boolean> ForceInlineGeneratorCalls = new OptionKey<>(false);
 
+    @Option(category = OptionCategory.EXPERT, help = "Force to automatically import site.py module.") //
+    public static final OptionKey<Boolean> ForceImportSite = new OptionKey<>(false);
+
     @Option(category = OptionCategory.EXPERT, help = "Minimal size of string, when lazy strings are used. Default 20") //
     public static final OptionKey<Integer> MinLazyStringLength = new OptionKey<>(20);