8000 bpo-46765: Replace Locally Cached Strings with Statically Initialized Objects by ericsnowcurrently · Pull Request #31366 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-46765: Replace Locally Cached Strings with Statically Initialized Objects #31366

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 19 commits into from
Feb 23, 2022
Merged

bpo-46765: Replace Locally Cached Strings with Statically Initialized Objects #31366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
fdf87ee
Use _Py_ID() in boolobject.c.
ericsnowcurrently Feb 16, 2022
2c2f917
Use _Py_ID() in classobject.c.
ericsnowcurrently Feb 16, 2022
5f2746b
Use _Py_ID() in codeobject.c.
ericsnowcurrently Feb 16, 2022
1df92a0
Drop outdated entries.
ericsnowcurrently Feb 16, 2022
da9810b
Move an entry to the right section.
ericsnowcurrently Feb 16, 2022
b06e610
Drop an outdated entry.
ericsnowcurrently Feb 16, 2022
b8ea691
Use _Py_ID() in listobject.c.
ericsnowcurrently Feb 16, 2022
42b714f
Use _Py_ID() in _warnings.c.
ericsnowcurrently Feb 16, 2022
c7c8faf
Use _Py_ID() in ast_unparse.c.
ericsnowcurrently Feb 16, 2022
92b0069
Use _Py_ID() in compile.c.
ericsnowcurrently Feb 16, 2022
226671e
Use _Py_ID() in symtable.c.
ericsnowcurrently Feb 16, 2022
3acf264
Drop outdated entries.
ericsnowcurrently Feb 16, 2022
3a02502
Use _Py_ID() in sysmodule.c.
ericsnowcurrently Feb 16, 2022
cd47553
Use _Py_ID() in the _io module.
ericsnowcurrently Feb 16, 2022
f8b7071
Use _Py_ID() in _tracemalloc.c.
ericsnowcurrently Feb 16, 2022
76d2955
Drop an outdated entry.
ericsnowcurrently Feb 16, 2022
02995b0
Use b'', not ''.
ericsnowcurrently Feb 16, 2022
efe208f
Use a ternary expression.
ericsnowcurrently Feb 16, 2022
1852340
Merge branch 'main' into global-objects-use-pyid
ericsnowcurrently Feb 17, 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
Use _Py_ID() in the _io module.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Feb 16, 2022
commit cd4755328c58279ed20925bd3661673bcac27130
6 changes: 6 additions & 0 deletions Include/internal/pycore_global_strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ struct _Py_global_strings {
STRUCT_FOR_ID(call)
STRUCT_FOR_ID(clear)
STRUCT_FOR_ID(close)
STRUCT_FOR_ID(closed)
STRUCT_FOR_ID(code)
STRUCT_FOR_ID(copy)
STRUCT_FOR_ID(copyreg)
Expand All @@ -243,6 +244,7 @@ struct _Py_global_strings {
STRUCT_FOR_ID(dispatch_table)
STRUCT_FOR_ID(displayhook)
STRUCT_FOR_ID(enable)
STRUCT_FOR_ID(encode)
STRUCT_FOR_ID(encoding)
STRUCT_FOR_ID(end_lineno)
STRUCT_FOR_ID(end_offset)
Expand All @ 10000 @ -260,6 +262,7 @@ struct _Py_global_strings {
STRUCT_FOR_ID(get)
STRUCT_FOR_ID(get_source)
STRUCT_FOR_ID(getattr)
STRUCT_FOR_ID(getstate)
STRUCT_FOR_ID(ignore)
STRUCT_FOR_ID(importlib)
STRUCT_FOR_ID(inf)
Expand All @@ -278,6 +281,7 @@ struct _Py_global_strings {
STRUCT_FOR_ID(lineno)
STRUCT_FOR_ID(listcomp)
STRUCT_FOR_ID(little)
STRUCT_FOR_ID(locale)
STRUCT_FOR_ID(match)
STRUCT_FOR_ID(metaclass)
STRUCT_FOR_ID(mode)
Expand All @@ -288,6 +292,7 @@ struct _Py_global_strings {
STRUCT_FOR_ID(n_sequence_fields)
STRUCT_FOR_ID(n_unnamed_fields)
STRUCT_FOR_ID(name)
STRUCT_FOR_ID(newlines)
STRUCT_FOR_ID(obj)
STRUCT_FOR_ID(offset)
STRUCT_FOR_ID(onceregistry)
Expand Down Expand Up @@ -332,6 +337,7 @@ struct _Py_global_strings {
STRUCT_FOR_ID(threading)
STRUCT_FOR_ID(throw)
STRUCT_FOR_ID(top)
STRUCT_FOR_ID(truncate)
STRUCT_FOR_ID(unraisablehook)
STRUCT_FOR_ID(values)
STRUCT_FOR_ID(version)
Expand Down
6 changes: 6 additions & 0 deletions Include/internal/pycore_runtime_init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,7 @@ extern "C" {
INIT_ID(call), \
INIT_ID(clear), \
INIT_ID(close), \
INIT_ID(closed), \
INIT_ID(code), \
INIT_ID(copy), \
INIT_ID(copyreg), \
Expand All @@ -858,6 +859,7 @@ extern "C" {
INIT_ID(dispatch_table), \
INIT_ID(displayhook), \
INIT_ID(enable), \
INIT_ID(encode), \
INIT_ID(encoding), \
INIT_ID(end_lineno), \
INIT_ID(end_offset), \
Expand All @@ -875,6 +877,7 @@ extern "C" {
INIT_ID(get), \
INIT_ID(get_source), \
INIT_ID(getattr), \
INIT_ID(getstate), \
INIT_ID(ignore), \
INIT_ID(importlib), \
INIT_ID(inf), \
Expand All @@ -893,6 +896,7 @@ extern "C" {
INIT_ID(lineno), \
INIT_ID(listcomp), \
INIT_ID(little), \
INIT_ID(locale), \
INIT_ID(match), \
INIT_ID(metaclass), \
INIT_ID(mode), \
Expand All @@ -903,6 +907,7 @@ extern "C" {
INIT_ID(n_sequence_fields), \
INIT_ID(n_unnamed_fields), \
INIT_ID(name), \
INIT_ID(newlines), \
INIT_ID(obj), \
INIT_ID(offset), \
INIT_ID(onceregistry), \
Expand Down Expand Up @@ -947,6 +952,7 @@ extern "C" {
INIT_ID(threading), \
INIT_ID(throw), \
INIT_ID(top), \
INIT_ID(truncate), \
INIT_ID(unraisablehook), \
INIT_ID(values), \
INIT_ID(version), \
Expand Down
114 changes: 1 addition & 113 deletions Modules/_io/_iomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,38 +24,6 @@
#include <windows.h>
#endif

/* Various interned strings */

PyObject *_PyIO_str_close = NULL;
PyObject *_PyIO_str_closed = NULL;
PyObject *_PyIO_str_decode = NULL;
PyObject *_PyIO_str_encode = NULL;
PyObject *_PyIO_str_fileno = NULL;
PyObject *_PyIO_str_flush = NULL;
PyObject *_PyIO_str_getstate = NULL;
PyObject *_PyIO_str_isatty = NULL;
PyObject *_PyIO_str_locale = NULL;
PyObject *_PyIO_str_newlines = NULL;
PyObject *_PyIO_str_nl = NULL;
PyObject *_PyIO_str_peek = NULL;
PyObject *_PyIO_str_read = NULL;
PyObject *_PyIO_str_read1 = NULL;
PyObject *_PyIO_str_readable = NULL;
PyObject *_PyIO_str_readall = NULL;
PyObject *_PyIO_str_readinto = NULL;
PyObject *_PyIO_str_readline = NULL;
PyObject *_PyIO_str_reset = NULL;
PyObject *_PyIO_str_seek = NULL;
PyObject *_PyIO_str_seekable = NULL;
PyObject *_PyIO_str_setstate = NULL;
PyObject *_PyIO_str_tell = NULL;
PyObject *_PyIO_str_truncate = NULL;
PyObject *_PyIO_str_writable = NULL;
PyObject *_PyIO_str_write = NULL;

PyObject *_PyIO_empty_str = NULL;
PyObject *_PyIO_empty_bytes = NULL;

PyDoc_STRVAR(module_doc,
"The io module provides the Python interfaces to stream handling. The\n"
"builtin open function is defined in this module.\n"
Expand Down Expand Up @@ -511,8 +479,7 @@ _io_text_encoding_impl(PyObject *module, PyObject *encoding, int stacklevel)
return NULL;
}
}
Py_INCREF(_PyIO_str_locale);
return _PyIO_str_locale;
return &_Py_ID(locale);
}
Py_INCREF(encoding);
return encoding;
Expand Down Expand Up @@ -699,41 +666,6 @@ _PyIO_Fini(void)
PyTypeObject *exc = static_types[i];
_PyStaticType_Dealloc(exc);
}

/* Interned strings */
#define CLEAR_INTERNED(name) \
Py_CLEAR(_PyIO_str_ ## name)

CLEAR_INTERNED(close);
CLEAR_INTERNED(closed);
CLEAR_INTERNED(decode);
CLEAR_INTERNED(encode);
CLEAR_INTERNED(fileno);
CLEAR_INTERNED(flush);
CLEAR_INTERNED(getstate);
CLEAR_INTERNED(isatty);
CLEAR_INTERNED(locale);
CLEAR_INTERNED(newlines);
CLEAR_INTERNED(peek);
CLEAR_INTERNED(read);
CLEAR_INTERNED(read1);
CLEAR_INTERNED(readable);
CLEAR_INTERNED(readall);
CLEAR_INTERNED(readinto);
CLEAR_INTERNED(readline);
CLEAR_INTERNED(reset);
CLEAR_INTERNED(seek);
CLEAR_INTERNED(seekable);
CLEAR_INTERNED(setstate);
CLEAR_INTERNED(tell);
CLEAR_INTERNED(truncate);
CLEAR_INTERNED(write);
CLEAR_INTERNED(writable);
#undef CLEAR_INTERNED

Py_CLEAR(_PyIO_str_nl);
Py_CLEAR(_PyIO_empty_str);
Py_CLEAR(_PyIO_empty_bytes);
}


Expand Down Expand Up @@ -797,50 +729,6 @@ PyInit__io(void)
}
}

/* Interned strings */
#define ADD_INTERNED(name) \
if (!_PyIO_str_ ## name && \
!(_PyIO_str_ ## name = PyUnicode_InternFromString(# name))) \
goto fail;

ADD_INTERNED(close)
ADD_INTERNED(closed)
ADD_INTERNED(decode)
ADD_INTERNED(encode)
ADD_INTERNED(fileno)
ADD_INTERNED(flush)
ADD_INTERNED(getstate)
ADD_INTERNED(isatty)
ADD_INTERNED(locale)
ADD_INTERNED(newlines)
ADD_INTERNED(peek)
ADD_INTERNED(read)
ADD_INTERNED(read1)
ADD_INTERNED(readable)
ADD_INTERNED(readall)
ADD_INTERNED(readinto)
ADD_INTERNED(readline)
ADD_INTERNED(reset)
ADD_INTERNED(seek)
ADD_INTERNED(seekable)
ADD_INTERNED(setstate)
ADD_INTERNED(tell)
ADD_INTERNED(truncate)
ADD_INTERNED(write)
ADD_INTERNED(writable)
#undef ADD_INTERNED

if (!_PyIO_str_nl &&
!(_PyIO_str_nl = PyUnicode_InternFromString("\n")))
goto fail;

if (!_PyIO_empty_str &&
!(_PyIO_empty_str = PyUnicode_FromStringAndSize(NULL, 0)))
goto fail;
if (!_PyIO_empty_bytes &&
!(_PyIO_empty_bytes = PyBytes_FromStringAndSize(NULL, 0)))
goto fail;

state->initialized = 1;

return m;
Expand Down
29 changes: 0 additions & 29 deletions Modules/_io/_iomodule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,33 +155,4 @@ extern _PyIO_State *_PyIO_get_module_state(void);
extern char _PyIO_get_console_type(PyObject *);
#endif

extern PyObject *_PyIO_str_close;
extern PyObject *_PyIO_str_closed;
extern PyObject *_PyIO_str_decode;
extern PyObject *_PyIO_str_encode;
extern PyObject *_PyIO_str_fileno;
extern PyObject *_PyIO_str_flush;
extern PyObject *_PyIO_str_getstate;
extern PyObject *_PyIO_str_isatty;
extern PyObject *_PyIO_str_newlines;
extern PyObject *_PyIO_str_nl;
extern PyObject *_PyIO_str_peek;
extern PyObject *_PyIO_str_read;
extern PyObject *_PyIO_str_read1;
extern PyObject *_PyIO_str_readable;
extern PyObject *_PyIO_str_readall;
extern PyObject *_PyIO_str_readinto;
extern PyObject *_PyIO_str_readline;
extern PyObject *_PyIO_str_reset;
extern PyObject *_PyIO_str_seek;
extern PyObject *_PyIO_str_seekable;
extern PyObject *_PyIO_str_setstate;
extern PyObject *_PyIO_str_tell;
extern PyObject *_PyIO_str_truncate;
extern PyObject *_PyIO_str_writable;
extern PyObject *_PyIO_str_write;

extern PyObject *_PyIO_empty_str;
extern PyObject *_PyIO_empty_bytes;

extern Py_EXPORTED_SYMBOL PyTypeObject _PyBytesIOBuffer_Type;
Loading
0