introduce _sysconfig builtin for truffle land config options

- patch _thread with dummy_thread when threads are disable (needed by setuptools)

Author: cosminbasca

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

@@ -40,7 +40,9 @@
 import re
 import sys
 
-try:
+import _sysconfig
+
+if _sysconfig.get_config_var('WITH_THREAD'):
     import threading
     import unittest
     from test import support
@@ -508,6 +510,3 @@ def test_state_after_timeout(self):
             lock.release()
             self.assertFalse(lock.locked())
             self.assertTrue(lock.acquire(blocking=False))
-
-except (ModuleNotFoundError, ImportError) as e:
-    print(e)

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

@@ -76,6 +76,7 @@
 import com.oracle.graal.python.builtins.modules.SignalModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.SocketModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.StringModuleBuiltins;
+import com.oracle.graal.python.builtins.modules.SysConfigModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.ThreadModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.TimeModuleBuiltins;
@@ -206,12 +207,9 @@ private static final String[] initializeCoreFiles() {
                         "_locale",
                         "_sre",
                         "function",
-                        "_socket"));
-
-        // threads
-        if (PythonLanguage.WITH_THREADS) {
-            coreFiles.add("_thread");
-        }
+                        "_sysconfig",
+                        "_socket",
+                        "_thread"));
 
         return coreFiles.toArray(new String[coreFiles.size()]);
     }
@@ -303,7 +301,8 @@ private static final PythonBuiltins[] initializeBuiltins() {
                         new PosixSubprocessModuleBuiltins(),
                         new CtypesModuleBuiltins(),
                         new ReadlineModuleBuiltins(),
-                        new PyExpatModuleBuiltins()));
+                        new PyExpatModuleBuiltins(),
+                        new SysConfigModuleBuiltins()));
         if (!TruffleOptions.AOT) {
             ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class);
             for (PythonBuiltins builtin : providers) {

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

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2018, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins.modules;
+
+import java.util.HashMap;
+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.truffle.api.dsl.GenerateNodeFactory;
+import com.oracle.truffle.api.dsl.NodeFactory;
+import com.oracle.truffle.api.dsl.Specialization;
+
+/**
+ * this builtin module is used to fill in truffle land config options into the sysconfig python
+ * module
+ */
+@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
+    protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
+        return SysConfigModuleBuiltinsFactory.getFactories();
+    }
+
+    @Builtin(name = "get_config_vars", takesVarArgs = true)
+    @GenerateNodeFactory
+    static abstract class GetConfigVarsNode extends PythonBuiltinNode {
+        @Specialization
+        PDict select(@SuppressWarnings("unused") Object[] arguments) {
+            return factory().createDict(STATIC_CONFIG_OPTIONS);
+        }
+    }
+}

graalpython/lib-graalpython/__builtins_patches__.py

@@ -37,20 +37,21 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import sys
+import _pyio
+import io
+
+import _io
+import _sysconfig
 import builtins
+import sys
+
 
 # ----------------------------------------------------------------------------------------------------------------------
 #
 # patch _io
 #
 # ----------------------------------------------------------------------------------------------------------------------
 
-import _io
-import _pyio
-import io
-
-
 @__builtin__
 def open(*args, **kwargs):
     return _pyio.open(*args, **kwargs)
@@ -72,3 +73,14 @@ def open(*args, **kwargs):
 
 
 setattr(builtins, 'open', open)
+
+
+# ----------------------------------------------------------------------------------------------------------------------
+#
+# patch _thread (needed for setuptools if threading is disabled)
+#
+# ----------------------------------------------------------------------------------------------------------------------
+if not _sysconfig.get_config_var('WITH_THREAD'):
+    import _dummy_thread
+    sys.modules["_thread"] = _dummy_thread
+

graalpython/lib-graalpython/_sysconfig.py

@@ -0,0 +1,42 @@
+# Copyright (c) 2018, 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
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+def get_config_var(name):
+    return get_config_vars().get(name)

graalpython/lib-graalpython/_thread.py

@@ -37,15 +37,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-error = RuntimeError
-TIMEOUT_MAX = __truffle_get_timeout_max__()
+import _sysconfig
+if _sysconfig.get_config_var('WITH_THREAD'):
+    error = RuntimeError
+    TIMEOUT_MAX = __truffle_get_timeout_max__()
 
 
-@__builtin__
-def allocate_lock():
-    return LockType()
+    @__builtin__
+    def allocate_lock():
+        return LockType()
 
 
-def _set_sentinel():
-    """Dummy implementation of _thread._set_sentinel()."""
-    return LockType()
+    def _set_sentinel():
+        """Dummy implementation of _thread._set_sentinel()."""
+        return LockType()