Fix the shutdown issue by keeping PyMethodDef.

filmor · filmor · commit 7e26298d6723 · 2017-01-31T07:34:00.000+01:00
Keeping the PyMethodDef around like the documentation (https://docs.python.org/3.6/c-api/module.html#c.PyModuleDef) suggests fixes issue #262.
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -16,7 +16,13 @@ internal class ImportHook
 
 #if PYTHON3
         static IntPtr py_clr_module;
-        static IntPtr module_def;
+        static IntPtr module_def = IntPtr.Zero;
+
+        internal static void InitializeModuleDef()
+        {
+            if (module_def == IntPtr.Zero)
+                module_def = ModuleDefOffset.AllocModuleDef("clr");
+        }
 #endif
 
         //===================================================================
@@ -44,8 +50,8 @@ internal static void Initialize()
             root = new CLRModule();
 
 #if PYTHON3
-    // create a python module with the same methods as the clr module-like object
-            module_def = ModuleDefOffset.AllocModuleDef("clr");
+            // create a python module with the same methods as the clr module-like object
+            InitializeModuleDef();
             py_clr_module = Runtime.PyModule_Create2(module_def, 3);
 
             // both dicts are borrowed references
@@ -70,25 +76,25 @@ internal static void Initialize()
 
         internal static void Shutdown()
         {
-#if PYTHON3
             if (0 != Runtime.Py_IsInitialized()) {
+#if PYTHON3
                 Runtime.XDecref(py_clr_module);
-                Runtime.XDecref(root.pyHandle);
-            }
-            ModuleDefOffset.FreeModuleDef(module_def);
 #elif PYTHON2
-            if (0 != Runtime.Py_IsInitialized())
-            {
-                Runtime.XDecref(root.pyHandle);
                 Runtime.XDecref(root.pyHandle);
-            }
 #endif
-            if (0 != Runtime.Py_IsInitialized())
-            {
+                Runtime.XDecref(root.pyHandle);
                 Runtime.XDecref(py_import);
             }
         }
 
+        internal static void Cleanup()
+        {
+#if PYTHON3
+            ModuleDefOffset.FreeModuleDef(module_def);
+            module_def = IntPtr.Zero;
+#endif
+        }
+
         //===================================================================
         // Return the clr python module (new reference)
         //===================================================================
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -227,7 +227,7 @@ public static IntPtr AllocModuleDef(string modulename) {
             byte[] ascii = Encoding.ASCII.GetBytes(modulename);
             int size = name + ascii.Length + 1;
             IntPtr ptr = Marshal.AllocHGlobal(size);
-            for (int i = 0; i <= m_free; i += IntPtr.Size)
+            for (int i = 0; i < m_free; i += IntPtr.Size)
                 Marshal.WriteIntPtr(ptr, i, IntPtr.Zero);
             Marshal.Copy(ascii, 0, (IntPtr)(ptr + name), ascii.Length);
             Marshal.WriteIntPtr(ptr, m_name, (IntPtr)(ptr + name));
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.IO;
 using System.Threading;
 using System.Reflection;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.IO;`
`3`	`3`	`using System.Threading;`
`4`	`4`	`using System.Reflection;`