refactor PyErr state to reduce blast radius of threading challenge
#4650
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidhewitt
force-pushed
the
err-refactor
branch
from
9f344ac to
66245fb
Compare
Icxolu
approved these changes
Oct 25, 2024
src/err/err_state.rs
Outdated
|
|
||
| pub(crate) fn normalize(self, py: Python<'_>) -> PyErrStateNormalized { | ||
| impl PyErrStateInner { | ||
| pub fn normalize(self, py: Python<'_>) -> PyErrStateNormalized { |
There was a problem hiding this comment.
Is there a particular reason this (and below) switched from pub(crate) to pub?
There was a problem hiding this comment.
Nope, just me moving stuff from the outer module and forgetting to adjust visibility. I'll fixup and proceed with merge. Thanks for catching 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
First step towards solving #4584.
Whether we drop the lazy state or not, the first step seems to be to clean up the
PyErrimplementation so that the location of the threading problem is fully localised withinerr_state.rs.I do this by wrapping the
UnsafeCell<Option<PyErrState>>as a newPyErrStatestruct and rename the original state enum toPyErrStateInner. The normalPyErrmethods now can't even see thePyErrStateInnerenum (and have to go through the.normalized()helper onPyErrState).This is a pure refactoring without any behaviour changes, we can decide on behaviour changes in future PRs.