Skip to content

bpo-46370: Move the static initializer for _PyRuntime to its own header file. #30587

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
merged 4 commits into from
Jan 13, 2022
Merged

bpo-46370: Move the static initializer for _PyRuntime to its own header file. #30587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc506de
Move _PyRuntimeState_INIT to its own header file.
ericsnowcurrently Jan 11, 2022
203b2d1
Move the global objects into pycore_runtime_init.h.
ericsnowcurrently Jan 11, 2022
b6cd891
Move _PyRuntimeState_INIT to the top.
ericsnowcurrently Jan 11, 2022
5d29023
Add a comment.
ericsnowcurrently Jan 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
569 changes: 1 addition & 568 deletions Include/internal/pycore_global_objects.h
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions Include/internal/pycore_object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,19 @@ extern "C" {
#include "pycore_interp.h" // PyInterpreterState.gc
#include "pycore_pystate.h" // _PyInterpreterState_GET()


#define _PyObject_IMMORTAL_INIT(type) \
{ \
.ob_refcnt = 999999999, \
.ob_type = type, \
}
#define _PyVarObject_IMMORTAL_INIT(type, size) \
{ \
.ob_base = _PyObject_IMMORTAL_INIT(type), \
.ob_size = size, \
}


PyAPI_FUNC(int) _PyType_CheckConsistency(PyTypeObject *type);
PyAPI_FUNC(int) _PyDict_CheckConsistency(PyObject *mp, int check_content);

Expand Down
15 changes: 0 additions & 15 deletions Include/internal/pycore_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,6 @@ typedef struct pyruntimestate {
PyInterpreterState _main_interpreter;
} _PyRuntimeState;

#define _PyThreadState_INIT \
{ \
._static = 1, \
}
#define _PyInterpreterState_INIT \
{ \
._static = 1, \
._initial_thread = _PyThreadState_INIT, \
}
#define _PyRuntimeState_INIT \
{ \
.global_objects = _Py_global_objects_INIT, \
._main_interpreter = _PyInterpreterState_INIT, \
}


/* other API */

Expand Down
Loading