bpo-46964: Move PyInterpreterState.config to _PyRuntimeState.config #31771
+173
−119
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
ericsnowcurrently
requested review from
gpshead,
pablogsal,
brettcannon,
encukou,
ncoghlan and
warsaw
as code owners
ericsnowcurrently
removed request for
brettcannon,
gpshead,
warsaw,
encukou,
ncoghlan and
pablogsal
arhadthedev
reviewed
Mar 8, 2022
arhadthedev
reviewed
Mar 8, 2022
ericsnowcurrently
force-pushed
the
runtime-config
branch
from
3f29756 to
81eda9b
Compare
markshannon
reviewed
Oct 7, 2022
| /* Allow the creation of threads. */ | ||
| unsigned int allow_threading:1; | ||
| /* Padding to ensure byte alignment. */ | ||
| unsigned int :5; |
There was a problem hiding this comment.
structs must be at least byte aligned, so this isn't strictly necessary.
| @@ -552,7 +552,7 @@ pymain_run_python(int *exitcode) | |||
| PyObject *main_importer_path = NULL; | |||
| PyInterpreterState *interp = _PyInterpreterState_GET(); | |||
| /* pymain_run_stdin() modify the config */ | |||
| PyConfig *config = (PyConfig*)_PyInterpreterState_GetConfig(interp); | |||
| PyConfig *config = (PyConfig*)_PyInterpreterState_GetGlobalConfig(interp); | |||
| @@ -15026,7 +15026,7 @@ static PyStatus | |||
| init_stdio_encoding(PyInterpreterState *interp) | |||
| { | |||
| /* Update the stdio encoding to the normalized Python codec name. */ | |||
| PyConfig *config = (PyConfig*)_PyInterpreterState_GetConfig(interp); | |||
| PyConfig *config = (PyConfig*)_PyInterpreterState_GetGlobalConfig(interp); | |||
| @@ -15097,7 +15097,7 @@ init_fs_encoding(PyThreadState *tstate) | |||
| /* Update the filesystem encoding to the normalized Python codec name. | |||
| For example, replace "ANSI_X3.4-1968" (locale encoding) with "ascii" | |||
| (Python codec name). */ | |||
| PyConfig *config = (PyConfig*)_PyInterpreterState_GetConfig(interp); | |||
| PyConfig *config = (PyConfig*)_PyInterpreterState_GetGlobalConfig(interp); | |||
| @@ -15140,7 +15140,7 @@ int | |||
| _PyUnicode_EnableLegacyWindowsFSEncoding(void) | |||
| { | |||
| PyInterpreterState *interp = _PyInterpreterState_GET(); | |||
| PyConfig *config = (PyConfig *)_PyInterpreterState_GetConfig(interp); | |||
| PyConfig *config = (PyConfig *)_PyInterpreterState_GetGlobalConfig(interp); | |||
| void | ||
| _PyInterpreterConfig_Clear(_PyInterpreterConfig *config) | ||
| { | ||
| *config = (_PyInterpreterConfig){}; |
| @@ -508,13 +510,20 @@ _PyInterpreterState_SetConfig(const PyConfig *src_config) | |||
| goto done; | |||
| } | |||
|
|
|||
| status = _PyConfig_Copy(&tstate->interp->config, &config); | |||
| status = _PyConfig_Copy(&tstate->interp->runtime->config, &config); | |||
There was a problem hiding this comment.
This seems a very convoluted way to get a static object
|
|
|
Yeah, there are a few things that I need to follow up on here. |
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.
As part of this, we also move
PyConfig._isolated_interpreterto a new_PyInterpreterConfigstruct and split it up into more granular settings. We also change some of the private API names to explicitly indicate they relate to global config.https://bugs.python.org/issue46964