Skip reload of already initialized ext modules.

Author: fangerer

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

@@ -56,7 +56,9 @@
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ExecModuleNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodesFactory.DefaultCheckFunctionResultNodeGen;
+import com.oracle.graal.python.builtins.objects.cext.capi.NativeMember;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodes.CheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtContext;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtContext.ModuleSpec;
@@ -65,6 +67,7 @@
 import com.oracle.graal.python.builtins.objects.cext.hpy.HPyExternalFunctionNodes.HPyCheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.hpy.HPyExternalFunctionNodesFactory.HPyCheckHandleResultNodeGen;
 import com.oracle.graal.python.builtins.objects.code.PCode;
+import com.oracle.graal.python.builtins.objects.common.HashingStorageLibrary;
 import com.oracle.graal.python.builtins.objects.ints.IntBuiltins;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
@@ -262,13 +265,25 @@ public abstract static class ExecDynamicNode extends PythonBuiltinNode {
         @Specialization
         int doPythonModule(VirtualFrame frame, PythonModule extensionModule,
                         @CachedLanguage PythonLanguage language,
+                        @CachedLibrary(limit = "1") HashingStorageLibrary lib,
                         @Cached ExecModuleNode execModuleNode) {
             Object nativeModuleDef = extensionModule.getNativeModuleDef();
             if (nativeModuleDef == null) {
                 return 0;
             }
 
-            // TODO(fa): check if module is already initialized
+            /*
+             * Check if module is already initialized. CPython does that by testing if 'md_state !=
+             * NULL'. So, we do the same. Currently, we store this in the generic storage of the
+             * native wrapper.
+             */
+            DynamicObjectNativeWrapper nativeWrapper = extensionModule.getNativeWrapper();
+            if (nativeWrapper != null && nativeWrapper.getNativeMemberStore() != null) {
+                Object item = lib.getItem(nativeWrapper.getNativeMemberStore(), NativeMember.MD_STATE.getMemberName());
+                if (item != PNone.NO_VALUE) {
+                    return 0;
+                }
+            }
 
             PythonContext context = getContext();
             if (!context.hasCApiContext()) {

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

@@ -50,6 +50,7 @@
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PY_TRUFFLE_BYTE_ARRAY_TO_NATIVE;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PY_TRUFFLE_STRING_TO_CSTR;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_WHCAR_SIZE;
+import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.MD_STATE;
 import static com.oracle.graal.python.builtins.objects.cext.capi.NativeMember.OB_REFCNT;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__COMPLEX__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemError;
@@ -99,6 +100,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.VoidPtrToJavaNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PrimitiveNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PythonObjectNativeWrapper;
+import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.WriteNativeMemberNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.DefaultCheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.MethKeywordsRoot;
 import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.MethNoargsRoot;
@@ -3759,7 +3761,7 @@ static Object doGeneric(CApiContext capiContext, ModuleSpec moduleSpec, PythonAb
     }
 
     /**
-     * Equivalent to {@code PyModule_ExecDef}.
+     * Equivalent of {@code PyModule_ExecDef}.
      */
     @GenerateUncached
     public abstract static class ExecModuleNode extends MultiPhaseExtensionModuleInitNode {
@@ -3774,6 +3776,8 @@ static int doGeneric(CApiContext capiContext, PythonModule module, Object module
                         @Cached PythonObjectFactory factory,
                         @Cached ModuleGetNameNode getNameNode,
                         @Cached PCallCapiFunction callGetterNode,
+                        @Cached WriteNativeMemberNode writeNativeMemberNode,
+                        @Cached PCallCapiFunction callMallocNode,
                         @CachedLibrary(limit = "3") InteropLibrary interopLib,
                         @Cached ToBorrowedRefNode moduleToNativeNode,
                         @Cached PRaiseNode raiseNode) {
@@ -3790,12 +3794,21 @@ static int doGeneric(CApiContext capiContext, PythonModule module, Object module
                 throw raiseNode.raise(PythonBuiltinClassType.SystemError, "Cannot create module from definition because: %m", e);
             }
 
-            if (mSize >= 0) {
-                // TODO(fa): allocate md_state
-            }
-
-            // parse slot definitions
             try {
+                // allocate md_state if necessary
+                if (mSize >= 0) {
+                    // The cast is not nice but it will at least fail if we change the wrapper type.
+                    PythonNativeWrapper moduleWrapper = (PythonNativeWrapper) moduleToNativeNode.execute(capiContext, module);
+                    /*
+                     * TODO(fa): We currently leak 'md_state' and need to use a shared finalizer or
+                     * similar. We ignore that for now since the size will usually be very small
+                     * and/or we could also use a Truffle buffer object.
+                     */
+                    Object moduleStatePtr = callMallocNode.call(capiContext, NativeCAPISymbol.FUN_PYMEM_RAWMALLOC, mSize);
+                    writeNativeMemberNode.execute(module, moduleWrapper, MD_STATE.getMemberName(), moduleStatePtr);
+                }
+
+                // parse slot definitions
                 Object slotDefinitions = callGetterNode.call(capiContext, FUN_GET_PYMODULEDEF_M_SLOTS, moduleDef);
                 if (interopLib.isNull(slotDefinitions)) {
                     return 0;

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

@@ -155,6 +155,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_NATIVE_UNICODE_AS_STRING("native_unicode_as_string"),
     FUN_PY_UNICODE_GET_LENGTH("PyUnicode_GetLength"),
     FUN_GET_UINT32_ARRAY_TYPE_ID("get_uint32_array_typeid"),
+    FUN_PYMEM_RAWMALLOC("PyMem_RawMalloc"),
     FUN_PY_TRUFFLE_FREE("PyTruffle_Free"),
     FUN_INCREF("Py_IncRef"),
     FUN_DECREF("Py_DecRef"),