Add corrections to the GIL acquiring/releasing

BadSingleton · BadSingleton · commit 8075f4827e6c · 2020-08-27T14:52:29.000-04:00
In Runtime's Initialize and Shutdown.
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -111,6 +111,8 @@ public class Runtime
         /// <summary>
         /// Initialize the runtime...
         /// </summary>
+        /// <remarks>When calling this method after a soft shutdown or a domain reload,
+        ///  this method acquires and releases the GIL. </remarks>
         internal static void Initialize(bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)
         {
             if (_isInitialized)
@@ -149,7 +151,8 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             }
             else
             {
-                PyEval_InitThreads();
+                // When initializing more than once (like on soft shutdown and domain
+                // reload), the GIL might not be acquired by the current thread.
                 state = PyGILState_Ensure();
                 MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
             }
@@ -366,6 +369,8 @@ internal static void Shutdown(ShutdownMode mode)
                     // Some clr runtime didn't implement GC.WaitForFullGCComplete yet.
                 }
                 PyGILState_Release(state);
+                // Then release the GIL for good.
+                PyEval_SaveThread();
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ public class Runtime`
`111`	`111`	`/// <summary>`
`112`	`112`	`/// Initialize the runtime...`
`113`	`113`	`/// </summary>`
	`114`	`+ /// <remarks>When calling this method after a soft shutdown or a domain reload,`
	`115`	`+ /// this method acquires and releases the GIL. </remarks>`
`114`	`116`	`internal static void Initialize(bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)`
`115`	`117`	`{`
`116`	`118`	`if (_isInitialized)`
`@@ -149,7 +151,8 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd`
`149`	`151`	`}`
`150`	`152`	`else`
`151`	`153`	`{`
`152`		`- PyEval_InitThreads();`
	`154`	`+ // When initializing more than once (like on soft shutdown and domain`
	`155`	`+ // reload), the GIL might not be acquired by the current thread.`
`153`	`156`	`state = PyGILState_Ensure();`
`154`	`157`	`MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;`
`155`	`158`	`}`
`@@ -366,6 +369,8 @@ internal static void Shutdown(ShutdownMode mode)`
`366`	`369`	`// Some clr runtime didn't implement GC.WaitForFullGCComplete yet.`
`367`	`370`	`}`
`368`	`371`	`PyGILState_Release(state);`
	`372`	`+ // Then release the GIL for good.`
	`373`	`+ PyEval_SaveThread();`
`369`	`374`	`}`
`370`	`375`	`else`
`371`	`376`	`{`