Uni-50101-Fixing_the_domain_reload_crash_on_second_init

lassond · web-flow · commit ad653e1326af · 2018-07-06T14:37:50.000-04:00
Now calling PythonEngine.Shutdown on domain reload
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -145,6 +145,19 @@ public static void Initialize(bool setSysArgv = true)
             Initialize(Enumerable.Empty<string>(), setSysArgv: setSysArgv);
         }
 
+        /// <summary>
+        /// On Domain Unload Event Handler
+        /// </summary>
+        /// <remarks>
+        /// Performs necessary tasks (shutdown) when the current app domain
+        /// gets unloaded, leaving the engine, the runtime and the Python
+        /// interpreter in consistent states
+        /// </remarks>
+        private static void OnDomainUnload(object sender, EventArgs e)
+        {
+            Shutdown();
+        }
+
         /// <summary>
         /// Initialize Method
         /// </summary>
@@ -158,6 +171,9 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true)
         {
             if (!initialized)
             {
+                // Make sure we shut down properly on app domain reload
+                System.AppDomain.CurrentDomain.DomainUnload += new EventHandler(OnDomainUnload);
+
                 // Creating the delegateManager MUST happen before Runtime.Initialize
                 // is called. If it happens afterwards, DelegateManager's CodeGenerator
                 // throws an exception in its ctor.  This exception is eaten somehow
@@ -294,6 +310,9 @@ public static void Shutdown()
         {
             if (initialized)
             {
+                // Make sure we shut down properly on app domain reload
+                System.AppDomain.CurrentDomain.DomainUnload -= OnDomainUnload;
+
                 PyScopeManager.Global.Clear();
                 Marshal.FreeHGlobal(_pythonHome);
                 _pythonHome = IntPtr.Zero;
