Visitar URL original
Take GIL when checking if error occurred on shutdown by filmor · Pull Request #1836 · pythonnet/pythonnet · GitHub
Skip to content

Take GIL when checking if error occurred on shutdown #1836

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 1 commit into from
Jun 27, 2022
Merged

Take GIL when checking if error occurred on shutdown #1836

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Take GIL when checking if error occurred on shutdown
  • Loading branch information
@filmor
filmor authored Jun 27, 2022
commit 071262047f35291c722fef14de0c240d1c812323
13 changes: 9 additions & 4 deletions src/runtime/PythonEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,12 +355,17 @@ public static void Shutdown()
{
return;
}
if (Exceptions.ErrorOccurred())

using (Py.GIL())
{
throw new InvalidOperationException(
"Python error indicator is set",
innerException: PythonException.PeekCurrentOrNull(out _));
if (Exceptions.ErrorOccurred())
{
throw new InvalidOperationException(
"Python error indicator is set",
innerException: PythonException.PeekCurrentOrNull(out _));
}
}

// If the shutdown handlers trigger a domain unload,
// don't call shutdown again.
AppDomain.CurrentDomain.DomainUnload -= OnDomainUnload;
Expand Down