* Load PyModuleType without LibraryLoader

amos402 · amos402 · commit 18d8da42cbfc · 2019-12-01T21:35:05.000+08:00
* Drop C module dependency when getting _PyObject_NextNotImplemented
* Exception details for SetNoSiteFlag
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -292,26 +292,18 @@ internal static void Initialize(bool initSigs = false)
 
             Error = new IntPtr(-1);
 
+            _PyObject_NextNotImplemented = Get_PyObject_NextNotImplemented();
+            {
+                IntPtr sys = PyImport_ImportModule("sys");
+                PyModuleType = PyObject_Type(sys);
+                XDecref(sys);
+            }
+
             // Initialize data about the platform we're running on. We need
             // this for the type manager and potentially other details. Must
             // happen after caching the python types, above.
             InitializePlatformData();
 
-            IntPtr dllLocal = IntPtr.Zero;
-            var loader = LibraryLoader.Get(OperatingSystem);
-
-            // Since `_PyObject_NextNotImplemented` would set to a heap class
-            // for tp_iternext which doesn't implement __next__.
-            // Thus we need a heap class to get it, the ZipImportError is a
-            // heap class and it's in builtins, so we can use it as a trick.
-            var zipimport = PyImport_ImportModule("zipimport");
-            var ZipImportError = PyObject_GetAttrString(zipimport, "ZipImportError");
-            _PyObject_NextNotImplemented = Marshal.ReadIntPtr(ZipImportError, TypeOffset.tp_iternext);
-            XDecref(ZipImportError);
-            XDecref(zipimport);
-            PyModuleType = loader.GetFunction(dllLocal, "PyModule_Type");
-
-
             // Initialize modules that depend on the runtime class.
             AssemblyManager.Initialize();
             PyCLRMetaType = MetaType.Initialize();
@@ -328,6 +320,29 @@ internal static void Initialize(bool initSigs = false)
             AssemblyManager.UpdatePath();
         }
 
+        private static IntPtr Get_PyObject_NextNotImplemented()
+        {
+            IntPtr globals = PyDict_New();
+            if (PyDict_SetItemString(globals, "__builtins__", PyEval_GetBuiltins()) != 0)
+            {
+                XDecref(globals);
+                throw new PythonException();
+            }
+            const string code = "class A(object): pass";
+            IntPtr res = PyRun_String(code, (IntPtr)RunFlagType.File, globals, globals);
+            if (res == IntPtr.Zero)
+            {
+                XDecref(globals);
+                throw new PythonException();
+            }
+            XDecref(res);
+            IntPtr A = PyDict_GetItemString(globals, "A");
+            IntPtr iternext = Marshal.ReadIntPtr(A, TypeOffset.tp_iternext);
+            XDecref(globals);
+            XDecref(A);
+            return iternext;
+        }
+
         /// <summary>
         /// Initializes the data about platforms.
         ///
@@ -936,7 +951,7 @@ internal static int PyObject_Compare(IntPtr value1, IntPtr value2)
 
         internal static long PyObject_Size(IntPtr pointer)
         {
-            return (long) _PyObject_Size(pointer);
+            return (long)_PyObject_Size(pointer);
         }
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PyObject_Size")]
@@ -1052,7 +1067,7 @@ internal static bool PyLong_Check(IntPtr ob)
 
         internal static IntPtr PyLong_FromUnsignedLong(object value)
         {
-            if(Is32Bit || IsWindows)
+            if (Is32Bit || IsWindows)
                 return PyLong_FromUnsignedLong32(Convert.ToUInt32(value));
             else
                 return PyLong_FromUnsignedLong64(Convert.ToUInt64(value));
@@ -1242,7 +1257,7 @@ internal static int PySequence_DelSlice(IntPtr pointer, long i1, long i2)
 
         internal static long PySequence_Size(IntPtr pointer)
         {
-            return (long) _PySequence_Size(pointer);
+            return (long)_PySequence_Size(pointer);
         }
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PySequence_Size")]
@@ -1267,7 +1282,7 @@ internal static IntPtr PySequence_Repeat(IntPtr pointer, long count)
 
         internal static long PySequence_Count(IntPtr pointer, IntPtr value)
         {
-            return (long) _PySequence_Count(pointer, value);
+            return (long)_PySequence_Count(pointer, value);
         }
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PySequence_Count")]
@@ -1310,7 +1325,7 @@ internal static IntPtr PyString_FromString(string value)
 
         internal static long PyBytes_Size(IntPtr op)
         {
-            return (long) _PyBytes_Size(op);
+            return (long)_PyBytes_Size(op);
         }
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PyBytes_Size")]
@@ -1537,7 +1552,7 @@ internal static bool PyDict_Check(IntPtr ob)
 
         internal static long PyDict_Size(IntPtr pointer)
         {
-            return (long) _PyDict_Size(pointer);
+            return (long)_PyDict_Size(pointer);
         }
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PyDict_Size")]
@@ -1615,7 +1630,7 @@ internal static int PyList_SetSlice(IntPtr pointer, long start, long end, IntPtr
 
         internal static long PyList_Size(IntPtr pointer)
         {
-            return (long) _PyList_Size(pointer);
+            return (long)_PyList_Size(pointer);
         }
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PyList_Size")]
@@ -1664,7 +1679,7 @@ internal static IntPtr PyTuple_GetSlice(IntPtr pointer, long start, long end)
 
         internal static long PyTuple_Size(IntPtr pointer)
         {
-            return (long) _PyTuple_Size(pointer);
+            return (long)_PyTuple_Size(pointer);
         }
 
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "PyTuple_Size")]
@@ -1893,25 +1908,24 @@ internal static IntPtr PyMem_Realloc(IntPtr ptr, long size)
 
         internal static void SetNoSiteFlag()
         {
+            if (_PythonDll == "__Internal")
+            {
+                throw new NotSupportedException("SetNoSiteFlag didn't support on static compile");
+            }
             var loader = LibraryLoader.Get(OperatingSystem);
-
-            IntPtr dllLocal;
-            if (_PythonDll != "__Internal")
+            IntPtr dllLocal = loader.Load(_PythonDll);
+            if (dllLocal == IntPtr.Zero)
             {
-                dllLocal = loader.Load(_PythonDll);
+                throw new Exception($"Cannot load {_PythonDll}");
             }
-
             try
             {
                 Py_NoSiteFlag = loader.GetFunction(dllLocal, "Py_NoSiteFlag");
                 Marshal.WriteInt32(Py_NoSiteFlag, 1);
             }
             finally
             {
-                if (dllLocal != IntPtr.Zero)
-                {
-                    loader.Free(dllLocal);
-                }
+                loader.Free(dllLocal);
             }
         }
     }
