Skip to content

gh-81057: Move Global Variables Holding Objects to _PyRuntimeState. #99487

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
ericsnowcurrently merged 11 commits into from
Nov 14, 2022
Merged

gh-81057: Move Global Variables Holding Objects to _PyRuntimeState. #99487

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
44a90b4
Move objreduce to PyInterpreterState.
ericsnowcurrently Nov 11, 2022
f748f82
Move the cached values in resolve_slotdups() to PyInterpreterState.
ericsnowcurrently Nov 11, 2022
8350dd1
Move next_version_tag to _PyRuntimeState.
ericsnowcurrently Nov 11, 2022
526d2da
Move _str_replace_inf to _PyRuntimeState.
ericsnowcurrently Nov 11, 2022
c68d016
Drop some globals from the whitelist.
ericsnowcurrently Nov 11, 2022
d5d6c2d
Move a whitelist entry to the right section.
ericsnowcurrently Nov 11, 2022
9f15148
Move some test-related globals to the ignored list.
ericsnowcurrently Nov 11, 2022
84c701d
Drop a missing global from the whitelist.
ericsnowcurrently Nov 11, 2022
b5a1f43
Drop another.
ericsnowcurrently Nov 11, 2022
4174479
Move a global from the whitelist to the ingored list.
ericsnowcurrently Nov 11, 2022
1275901
Move a whitelist entry to the right section.
ericsnowcurrently Nov 11, 2022
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
Prev Previous commit
Next Next commit
Move _str_replace_inf to _PyRuntimeState.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Nov 14, 2022
commit 526d2daa3373dae6fa294371b459752cb3f8513e
7 changes: 7 additions & 0 deletions Include/internal/pycore_global_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ extern "C" {
// Only immutable objects should be considered runtime-global.
// All others must be per-interpreter.

#define _Py_CACHED_OBJECT(NAME) \
_PyRuntime.cached_objects.NAME

struct _Py_cached_objects {
PyObject *str_replace_inf;
};

#define _Py_GLOBAL_OBJECT(NAME) \
_PyRuntime.global_objects.NAME
#define _Py_SINGLETON(NAME) \
Expand Down
1 change: 1 addition & 0 deletions Include/internal/pycore_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ typedef struct pyruntimestate {
} types;

/* All the objects that are shared by the runtime's interpreters. */
struct _Py_cached_objects cached_objects;
struct _Py_global_objects global_objects;

/* The following fields are here to avoid allocation during init.
Expand Down
4 changes: 4 additions & 0 deletions Parser/asdl_c.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1483,6 +1483,10 @@ def generate_ast_fini(module_state, f):
for s in module_state:
f.write(" Py_CLEAR(state->" + s + ');\n')
f.write(textwrap.dedent("""
if (_PyInterpreterState_Get() == _PyInterpreterState_Main()) {
Py_CLEAR(_Py_CACHED_OBJECT(str_replace_inf));
}

#if !defined(NDEBUG)
state->initialized = -1;
#else
Expand Down
4 changes: 4 additions & 0 deletions Python/Python-ast.c
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Python/ast_unparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ _Py_DECLARE_STR(open_br, "{");
_Py_DECLARE_STR(dbl_open_br, "{{");
_Py_DECLARE_STR(close_br, "}");
_Py_DECLARE_STR(dbl_close_br, "}}");
static PyObject *_str_replace_inf;
#define _str_replace_inf _Py_CACHED_OBJECT(str_replace_inf)

/* Forward declarations for recursion via helper functions. */
static PyObject *
Expand Down
6 changes: 0 additions & 6 deletions Tools/c-analyzer/cpython/globals-to-fix.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,12 +298,6 @@ Objects/setobject.c - _dummy_struct -
Objects/setobject.c - _PySet_Dummy -
Objects/sliceobject.c - _Py_EllipsisObject -

#-----------------------
# cached - initialized once

# manually cached PyUnicodeObject
Python/ast_unparse.c - _str_replace_inf -

#-----------------------
# other

Expand Down