Skip to content
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

gh-90111: Minor Cleanup for Runtime-Global Objects #100254

Merged
merged 4 commits into from
Dec 14, 2022
Merged

gh-90111: Minor Cleanup for Runtime-Global Objects #100254

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
c4dbfb5
Move the interned dict from _PyRuntime.global_objects to _PyRuntime.c…
ericsnowcurrently Dec 14, 2022
fb890fe
Use _Py_CACHED_OBJECT() for the interned strings.
ericsnowcurrently Dec 14, 2022
3d428fd
interned -> interned_strings
ericsnowcurrently Dec 14, 2022
db8ddb5
global_objects -> static_objects
ericsnowcurrently Dec 14, 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
8 changes: 4 additions & 4 deletions Include/internal/pycore_global_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,16 @@ extern "C" {

struct _Py_cached_objects {
PyObject *str_replace_inf;

PyObject *interned_strings;
};

#define _Py_GLOBAL_OBJECT(NAME) \
_PyRuntime.global_objects.NAME
_PyRuntime.static_objects.NAME
#define _Py_SINGLETON(NAME) \
_Py_GLOBAL_OBJECT(singletons.NAME)

struct _Py_global_objects {
struct _Py_static_objects {
struct {
/* Small integers are preallocated in this array so that they
* can be shared.
Expand All @@ -59,8 +61,6 @@ struct _Py_global_objects {
PyHamtNode_Bitmap hamt_bitmap_node_empty;
_PyContextTokenMissing context_token_missing;
} singletons;

PyObject *interned;
};

#define _Py_INTERP_CACHED_OBJECT(interp, NAME) \
Expand Down
2 changes: 1 addition & 1 deletion Include/internal/pycore_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ typedef struct pyruntimestate {

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

/* The following fields are here to avoid allocation during init.
The data is exposed through _PyRuntimeState pointer fields.
Expand Down
2 changes: 1 addition & 1 deletion Include/internal/pycore_runtime_init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ extern "C" {
.types = { \
.next_version_tag = 1, \
}, \
.global_objects = { \
.static_objects = { \
.singletons = { \
.small_ints = _Py_small_ints_INIT, \
.bytes_empty = _PyBytes_SIMPLE_INIT(0, 0), \
Expand Down
4 changes: 2 additions & 2 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,12 @@ static inline PyObject* unicode_new_empty(void)
*/
static inline PyObject *get_interned_dict(void)
{
return _PyRuntime.global_objects.interned;
return _Py_CACHED_OBJECT(interned_strings);
}

static inline void set_interned_dict(PyObject *dict)
{
_PyRuntime.global_objects.interned = dict;
_Py_CACHED_OBJECT(interned_strings) = dict;
}

#define _Py_RETURN_UNICODE_EMPTY() \
Expand Down