bpo-30860: Consolidate stateful runtime globals. #3397
Merged
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
1st1,
ncoghlan and
rhettinger
as code owners
benjaminp
reviewed
Sep 6, 2017
Include/ceval.h
Outdated
| @@ -93,7 +93,12 @@ PyAPI_FUNC(int) Py_GetRecursionLimit(void); | |||
| PyThreadState_GET()->overflowed = 0; \ | |||
| } while(0) | |||
| PyAPI_FUNC(int) _Py_CheckRecursiveCall(const char *where); | |||
| PyAPI_DATA(int) _Py_CheckRecursionLimit; | |||
There was a problem hiding this comment.
This is in the stable API, no?
There was a problem hiding this comment.
:( I'm going to revert the _Py_CheckRecursionLimit part of the change for now and circle back after this patch lands.
Include/internal/ceval.h
Outdated
| extern "C" { | ||
| #endif | ||
|
|
||
| #include <ceval.h> |
There was a problem hiding this comment.
These sorts of includes should probably be quoted and qualified "internal/ceval.h".
Python/pystate.c
Outdated
| void | ||
| _PyRuntimeState_Init(_PyRuntimeState *runtime) | ||
| { | ||
| _PyRuntimeState initial = {}; |
There was a problem hiding this comment.
Empty initializers aren't standard. You should probably just memset it to 0.
Parser/pgenmain.c
Outdated
|
|
||
| int Py_DebugFlag; | ||
| int Py_VerboseFlag; | ||
| int Py_IgnoreEnvironmentFlag; | ||
| struct pyruntimestate _PyRuntime = {}; |
There was a problem hiding this comment.
ditto on empty initializer list
ericsnowcurrently
force-pushed
the
interp-globals
branch
from
feb5752
to
632e760
Compare
ericsnowcurrently
force-pushed
the
interp-globals
branch
from
6bc2c67
to
1c85e28
Compare
ncoghlan
approved these changes
Sep 7, 2017
ericsnowcurrently
force-pushed
the
interp-globals
branch
from
8f47c44
to
73f8ef1
Compare
ericsnowcurrently
force-pushed
the
interp-globals
branch
from
73f8ef1
to
f1f10ff
Compare
ma8ma
added a commit
to ma8ma/cpython
that referenced
this pull request
Sep 9, 2017
Resolve conflicts: 2ebc5ce bpo-30860: Consolidate stateful runtime globals. (python#3397)
ericsnowcurrently
added a commit
that referenced
this pull request
Sep 12, 2017
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.
(trying again; see #2594)
Other globals are excluded (see globals.txt and check-c-globals.py).
https://bugs.python.org/issue30860