[GR-12976] _thread builtin support controllable via expert mode level "python.WithThread" option

PullRequest: graalpython/325

Author: cosminbasca

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

@@ -103,8 +103,6 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
     public static final int MICRO = 0;
     public static final String VERSION = MAJOR + "." + MINOR + "." + MICRO;
 
-    public static boolean WITH_THREADS = false;
-
     public static final String MIME_TYPE = "text/x-python";
     public static final String EXTENSION = ".py";
 
@@ -141,7 +139,7 @@ protected boolean patchContext(PythonContext context, Env newEnv) {
     @Override
     protected PythonContext createContext(Env env) {
         ensureHomeInOptions(env);
-        Python3Core newCore = new Python3Core(new PythonParserImpl());
+        Python3Core newCore = new Python3Core(new PythonParserImpl(), env);
         return new PythonContext(this, env, newCore);
     }
 
@@ -491,7 +489,7 @@ protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
         if (singleThreaded) {
             return super.isThreadAccessAllowed(thread, singleThreaded);
         }
-        return WITH_THREADS;
+        return PythonOptions.isWithThread();
     }
 
     @Override

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

@@ -227,7 +227,7 @@ private static final String[] initializeCoreFiles() {
 
     private final PythonBuiltins[] builtins;
 
-    private static final PythonBuiltins[] initializeBuiltins() {
+    private static final PythonBuiltins[] initializeBuiltins(Env env) {
         List<PythonBuiltins> builtins = new ArrayList<>(Arrays.asList(
                         new BuiltinConstructors(),
                         new BuiltinFunctions(),
@@ -330,7 +330,7 @@ private static final PythonBuiltins[] initializeBuiltins() {
             }
         }
         // threads
-        if (PythonLanguage.WITH_THREADS) {
+        if (env.getOptions().get(PythonOptions.WithThread)) {
             builtins.addAll(new ArrayList<>(Arrays.asList(
                             new ThreadModuleBuiltins(),
                             new ThreadBuiltins(),
@@ -361,9 +361,9 @@ private static final PythonBuiltins[] initializeBuiltins() {
 
     private final PythonObjectFactory factory = PythonObjectFactory.create();
 
-    public Python3Core(PythonParser parser) {
+    public Python3Core(PythonParser parser, Env env) {
         this.parser = parser;
-        this.builtins = initializeBuiltins();
+        this.builtins = initializeBuiltins(env);
         this.coreFiles = initializeCoreFiles();
     }
 

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

@@ -44,13 +44,14 @@
 import java.util.List;
 import java.util.Map;
 
-import com.oracle.graal.python.PythonLanguage;
 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.objects.dict.PDict;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
+import com.oracle.graal.python.runtime.PythonCore;
+import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -62,8 +63,11 @@
 @CoreFunctions(defineModule = "_sysconfig")
 public class SysConfigModuleBuiltins extends PythonBuiltins {
     private final static Map<Object, Object> STATIC_CONFIG_OPTIONS = new HashMap<>();
-    static {
-        STATIC_CONFIG_OPTIONS.put("WITH_THREAD", PythonLanguage.WITH_THREADS ? 1 : 0);
+
+    @Override
+    public void initialize(PythonCore core) {
+        super.initialize(core);
+        STATIC_CONFIG_OPTIONS.put("WITH_THREAD", PythonOptions.isWithThread() ? 1 : 0);
     }
 
     @Override

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

@@ -82,6 +82,9 @@ private PythonOptions() {
     @Option(category = OptionCategory.EXPERT, help = "This option is set by the Python launcher to tell the language it can print exceptions directly") //
     public static final OptionKey<Boolean> AlwaysRunExcepthook = new OptionKey<>(false);
 
+    @Option(category = OptionCategory.EXPERT, help = "This option control builtin _thread module support") //
+    public static final OptionKey<Boolean> WithThread = new OptionKey<>(false);
+
     @Option(category = OptionCategory.USER, help = "This option makes reading from files return opaque objects. Imports can work with such data, " +
                     "but all other access to the contents of the file is disabled, so the files are kept secret.") //
     public static final OptionKey<Boolean> OpaqueFilesystem = new OptionKey<>(false);
@@ -156,4 +159,8 @@ public static boolean useLazyString() {
     public static int getMinLazyStringLength() {
         return getOption(PythonLanguage.getContextRef().get(), MinLazyStringLength);
     }
+
+    public static boolean isWithThread() {
+        return getOption(PythonLanguage.getContextRef().get(), WithThread);
+    }
 }