Use Py.GIL directly, now that it doesn't try to init anymore

filmor · filmor · commit 5eccd45a7ed9 · 2022-05-04T07:39:50.000+02:00
diff --git a/src/runtime/Loader.cs b/src/runtime/Loader.cs
@@ -23,18 +23,8 @@ public unsafe static int Initialize(IntPtr data, int size)
                     PythonDLL = null;
                 }
 
-                var gs = PyGILState_Ensure();
-
-                try
-                {
-                    // Console.WriteLine("Startup thread");
-                    PythonEngine.InitExt();
-                    // Console.WriteLine("Startup finished");
-                }
-                finally
-                {
-                    PyGILState_Release(gs);
-                }
+                using var _ = Py.GIL();
+                PythonEngine.InitExt();
             }
             catch (Exception exc)
             {
@@ -55,15 +45,8 @@ public unsafe static int Shutdown(IntPtr data, int size)
 
                 if (command == "full_shutdown")
                 {
-                    var gs = PyGILState_Ensure();
-                    try
-                    {
-                        PythonEngine.Shutdown();
-                    }
-                    finally
-                    {
-                        PyGILState_Release(gs);
-                    }
+                    using var _ = Py.GIL();
+                    PythonEngine.Shutdown();
                 }
             }
             catch (Exception exc)
