Implement PyImport_GetModule

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_misc.py

@@ -165,6 +165,17 @@ class TestMisc(CPyExtTestCase):
         cmpfunc=unhandled_error_compare
     )
 
+    test_PyImport_GetModule = CPyExtFunction(
+        lambda args: sys.modules.get(args[0]),
+        lambda: (
+            ("os",),
+        ),
+        resultspec="O",
+        argspec="O",
+        arguments=["PyObject* name"],
+        cmpfunc=unhandled_error_compare
+    )
+
     test_PyTruffle_Intrinsic_Pmovmskb = CPyExtFunction(
         lambda args: True,
         lambda: (

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextImportBuiltins.java

@@ -52,15 +52,26 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.T_GLOBALS;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_LOCALS;
 import static com.oracle.graal.python.nodes.BuiltinNames.T___IMPORT__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___INITIALIZING__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___SPEC__;
+import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApi5BuiltinNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltin;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiNullaryBuiltinNode;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiUnaryBuiltinNode;
+import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
+import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
 import com.oracle.graal.python.lib.PyObjectGetAttr;
+import com.oracle.graal.python.lib.PyObjectGetItem;
+import com.oracle.graal.python.lib.PyObjectIsTrueNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.statement.AbstractImportNode;
+import com.oracle.graal.python.runtime.PythonContext;
+import com.oracle.graal.python.runtime.exception.PException;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -103,4 +114,39 @@ Object importModuleLevelObject(TruffleString name, Object globals, Object locals
             });
         }
     }
+
+    @CApiBuiltin(ret = PyObjectTransfer, args = {PyObject}, call = Direct)
+    abstract static class PyImport_GetModule extends CApiUnaryBuiltinNode {
+
+        private static final TruffleString T__LOCK_UNLOCK_MODULE = tsLiteral("_lock_unlock_module");
+
+        @Specialization
+        @TruffleBoundary
+        Object getModule(Object name) {
+            PythonContext context = PythonContext.get(null);
+            PDict modules = context.getSysModules();
+            Object m;
+            try {
+                m = PyObjectGetItem.executeUncached(modules, name);
+            } catch (PException e) {
+                return context.getNativeNull();
+            }
+            if (m != PNone.NONE) {
+                boolean initializing = false;
+                try {
+                    Object spec = PyObjectGetAttr.executeUncached(m, T___SPEC__);
+                    Object initializingObj = PyObjectGetAttr.executeUncached(spec, T___INITIALIZING__);
+                    if (PyObjectIsTrueNode.executeUncached(initializingObj)) {
+                        initializing = true;
+                    }
+                } catch (PException e) {
+                    // ignore
+                }
+                if (initializing) {
+                    PyObjectCallMethodObjArgs.executeUncached(context.getImportlib(), T__LOCK_UNLOCK_MODULE, name);
+                }
+            }
+            return m;
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiFunction.java

@@ -770,7 +770,6 @@ public final class CApiFunction {
     @CApiBuiltin(name = "PyImport_GetImporter", ret = PyObject, args = {PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "PyImport_GetMagicNumber", ret = Long, args = {}, call = NotImplemented)
     @CApiBuiltin(name = "PyImport_GetMagicTag", ret = ConstCharPtrAsTruffleString, args = {}, call = NotImplemented)
-    @CApiBuiltin(name = "PyImport_GetModule", ret = PyObject, args = {PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "PyImport_ImportFrozenModule", ret = Int, args = {ConstCharPtrAsTruffleString}, call = NotImplemented)
     @CApiBuiltin(name = "PyImport_ImportFrozenModuleObject", ret = Int, args = {PyObject}, call = NotImplemented)
     @CApiBuiltin(name = "PyImport_ReloadModule", ret = PyObject, args = {PyObject}, call = NotImplemented)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/SpecialAttributeNames.java

@@ -114,6 +114,8 @@ public abstract class SpecialAttributeNames {
 
     public static final TruffleString T___CACHED__ = tsLiteral("__cached__");
 
+    public static final TruffleString T___INITIALIZING__ = tsLiteral("__initializing__");
+
     public static final String J___TEXT_SIGNATURE__ = "__text_signature__";
     public static final TruffleString T___TEXT_SIGNATURE__ = tsLiteral(J___TEXT_SIGNATURE__);