A better fix for releasing a re-acquiring the GIL

BadSingleton · BadSingleton · commit 19d137951721 · 2020-09-02T13:34:21.000-04:00
On shutdown and startup.
The main python thread always havea state. After releasing the state on
shutdown, restore the state of the main thread (thus also locking the
GIL).
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -151,9 +151,10 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             }
             else
             {
-                // 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();
+                // If we're coming back from a domain reload or a soft shutdown,
+                // we have previously released the thread state. Restore the main
+                // thread state here.
+                PyEval_RestoreThread(PyGILState_GetThisThreadState());
                 MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;
             }
 
@@ -198,10 +199,6 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd
             }
             XDecref(item);
             AssemblyManager.UpdatePath();
-            if (state != IntPtr.Zero)
-            {
-                PyGILState_Release(state);
-            }
         }
 
         private static void InitPyMembers()

Original file line number	Diff line number	Diff line change
`@@ -151,9 +151,10 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd`
`151`	`151`	`}`
`152`	`152`	`else`
`153`	`153`	`{`
`154`		`- // When initializing more than once (like on soft shutdown and domain`
`155`		`- // reload), the GIL might not be acquired by the current thread.`
`156`		`- state = PyGILState_Ensure();`
	`154`	`+ // If we're coming back from a domain reload or a soft shutdown,`
	`155`	`+ // we have previously released the thread state. Restore the main`
	`156`	`+ // thread state here.`
	`157`	`+ PyEval_RestoreThread(PyGILState_GetThisThreadState());`
`157`	`158`	`MainManagedThreadId = Thread.CurrentThread.ManagedThreadId;`
`158`	`159`	`}`
`159`	`160`
`@@ -198,10 +199,6 @@ internal static void Initialize(bool initSigs = false, ShutdownMode mode = Shutd`
`198`	`199`	`}`
`199`	`200`	`XDecref(item);`
`200`	`201`	`AssemblyManager.UpdatePath();`
`201`		`- if (state != IntPtr.Zero)`
`202`		`- {`
`203`		`- PyGILState_Release(state);`
`204`		`- }`
`205`	`202`	`}`
`206`	`203`
`207`	`204`	`private static void InitPyMembers()`