use -v verbose flag to print information about context initialization, too

Author: timfel

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

@@ -65,6 +65,7 @@ public static void main(String[] args) {
     private String commandString = null;
     private String inputFile = null;
     private boolean inspectFlag = false;
+    private boolean verboseFlag = false;
     private boolean runCC = false;
     private boolean runLD = false;
     private VersionAction versionAction = VersionAction.None;
@@ -81,6 +82,9 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
                 case "-B":
                     System.out.println("Warning: " + arg + " does nothing on GraalPython.");
                     break;
+                case "-v":
+                    verboseFlag = true;
+                    break;
                 case "-V":
                 case "--version":
                     versionAction = VersionAction.PrintAndExit;
@@ -160,7 +164,10 @@ protected void launch(Builder contextBuilder) {
         // to print Python exceptions
         contextBuilder.option("python.AlwaysRunExcepthook", "true");
         if (inspectFlag) {
-            contextBuilder.option("python.PythonInspectFlag", "true");
+            contextBuilder.option("python.InspectFlag", "true");
+        }
+        if (verboseFlag) {
+            contextBuilder.option("python.VerboseFlag", "true");
         }
 
         ConsoleHandler consoleHandler = createConsoleHandler(System.in, System.out);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -26,6 +26,7 @@
 package com.oracle.graal.python;
 
 import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 
 import org.graalvm.options.OptionDescriptors;
@@ -117,7 +118,13 @@ private static boolean optionsAllowPreInitializedContext(PythonContext context,
         // Verify that the option for using a shared core is the same as
         // at image building time
         final boolean useSharedCore = newEnv.getOptions().get(PythonOptions.SharedCore);
-        return context.getCore().hasSingletonContext() == !useSharedCore;
+        boolean canUsePreinitializedContext = context.getCore().hasSingletonContext() == !useSharedCore;
+        if (canUsePreinitializedContext) {
+            PythonCore.writeInfo(newEnv, "Using preinitialized context.");
+        } else {
+            PythonCore.writeInfo(newEnv, "Not using preinitialized context.");
+        }
+        return canUsePreinitializedContext;
     }
 
     @Override
@@ -137,6 +144,12 @@ private void ensureHomeInOptions(Env env) {
         String coreHome = env.getOptions().get(PythonOptions.CoreHome);
         String stdLibHome = env.getOptions().get(PythonOptions.StdLibHome);
 
+        PythonCore.writeInfo(env, (MessageFormat.format("Initial locations:" +
+                        "\n\tLanguage home: {0}" +
+                        "\n\tSysPrefix: {1}" +
+                        "\n\tCoreHome: {2}" +
+                        "\n\tStdLibHome: {3}", languageHome, sysPrefix, coreHome, stdLibHome)));
+
         TruffleFile home = null;
         if (languageHome != null) {
             home = env.getTruffleFile(languageHome);
@@ -187,6 +200,12 @@ private void ensureHomeInOptions(Env env) {
                 }
                 env.getOptions().set(PythonOptions.StdLibHome, stdLibHome);
             }
+
+            PythonCore.writeInfo(env, (MessageFormat.format("Updated locations:" +
+                            "\n\tLanguage home: {0}" +
+                            "\n\tSysPrefix: {1}" +
+                            "\n\tCoreHome: {2}" +
+                            "\n\tStdLibHome: {3}", home.getPath(), sysPrefix, coreHome, stdLibHome)));
         }
     }
 

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

@@ -124,13 +124,23 @@ public interface PythonCore {
     public PythonContext getContext();
 
     static void writeWarning(TruffleLanguage.Env env, String warning) {
-        if (!LIBPOLYGLOT) {
-            try {
-                env.err().write("[python] WARNING: ".getBytes());
-                env.err().write(warning.getBytes());
-                env.err().write('\n');
-            } catch (IOException e) {
-            }
+        if (!LIBPOLYGLOT || env.getOptions().get(PythonOptions.VerboseFlag)) {
+            write(env, "WARNING: " + warning);
+        }
+    }
+
+    static void writeInfo(TruffleLanguage.Env env, String warning) {
+        if (env.getOptions().get(PythonOptions.VerboseFlag)) {
+            write(env, warning);
+        }
+    }
+
+    static void write(TruffleLanguage.Env env, String warning) {
+        try {
+            env.err().write("[python] ".getBytes());
+            env.err().write(warning.getBytes());
+            env.err().write('\n');
+        } catch (IOException e) {
         }
     }
 
@@ -155,7 +165,7 @@ public static String getSysPrefix(TruffleLanguage.Env env) {
         String sysPrefix = env.getOptions().get(PythonOptions.SysPrefix);
         if (sysPrefix.isEmpty()) {
             writeWarning(env, NO_PREFIX_WARNING);
-            env.getOptions().set(PythonOptions.CoreHome, PREFIX);
+            env.getOptions().set(PythonOptions.SysPrefix, PREFIX);
             return LIB_GRAALPYTHON;
         }
         return sysPrefix;

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

@@ -98,11 +98,14 @@ private PythonOptions() {
     public static final OptionKey<Boolean> AlwaysRunExcepthook = new OptionKey<>(false);
 
     @Option(category = OptionCategory.USER, help = "") //
-    public static final OptionKey<Boolean> PythonInspectFlag = new OptionKey<>(false);
+    public static final OptionKey<Boolean> InspectFlag = new OptionKey<>(false);
 
     @Option(category = OptionCategory.USER, help = "Remove assert statements and any code conditional on the value of __debug__.") public static final OptionKey<Boolean> PythonOptimizeFlag = new OptionKey<>(
                     false);
 
+    @Option(category = OptionCategory.DEBUG, help = "Turn on verbose mode") //
+    public static final OptionKey<Boolean> VerboseFlag = new OptionKey<>(false);
+
     public static OptionDescriptors createDescriptors() {
         return new PythonOptionsOptionDescriptors();
     }