Skip to content

Miscellaneous fixes and cleanups #1760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filmor merged 4 commits into from
May 4, 2022
Merged

Miscellaneous fixes and cleanups #1760

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5eccd45
Use Py.GIL directly, now that it doesn't try to init anymore
filmor Mar 10, 2022
d2d3ba6
Modernise syntax a bit
filmor Mar 30, 2022
d899083
Fix Py.SetArgv for systems that don't support GetCommandLineArgs
filmor Mar 30, 2022
aa5b54b
Modernise syntax in ClassDerived
filmor Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use Py.GIL directly, now that it doesn't try to init anymore
  • Loading branch information
@filmor
filmor committed May 4, 2022
commit 5eccd45a7ed9b4fddc9345fad1f7f63fa5d0adf3
25 changes: 4 additions & 21 deletions src/runtime/Loader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
Expand Down