Skip to content

Commit

Permalink
eagerly complete once in normalized error state (#4766)
Browse files Browse the repository at this point in the history
* eagerly complete once in normalized error state

* newsfragment
  • Loading branch information
davidhewitt authored Dec 6, 2024
1 parent 77202aa commit 5aa2a9b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions newsfragments/4766.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix unnecessary internal `py.allow_threads` GIL-switch when attempting to access contents of a `PyErr` which originated from Python (could lead to unintended deadlocks).
8 changes: 7 additions & 1 deletion src/err/err_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ impl PyErrState {
}

pub(crate) fn normalized(normalized: PyErrStateNormalized) -> Self {
Self::from_inner(PyErrStateInner::Normalized(normalized))
let state = Self::from_inner(PyErrStateInner::Normalized(normalized));
// This state is already normalized, by completing the Once immediately we avoid
// reaching the `py.allow_threads` in `make_normalized` which is less efficient
// and introduces a GIL switch which could deadlock.
// See https://github.com/PyO3/pyo3/issues/4764
state.normalized.call_once(|| {});
state
}

pub(crate) fn restore(self, py: Python<'_>) {
Expand Down

0 comments on commit 5aa2a9b

Please sign in to comment.