Visitar URL original
gh-81057: Move Globals in Core Code to _PyRuntimeState by ericsnowcurrently · Pull Request #99496 · python/cpython · GitHub
Skip to content

gh-81057: Move Globals in Core Code to _PyRuntimeState #99496

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 15 commits into from
Nov 15, 2022
Merged

gh-81057: Move Globals in Core Code to _PyRuntimeState #99496

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7c18aeb
Move the legacy config flag globals to the ignored list.
ericsnowcurrently Nov 14, 2022
dbe7219
Move a safe static buffer to the ignored list.
ericsnowcurrently Nov 14, 2022
f45f960
Move effectively-const globals initialized during init.
ericsnowcurrently Nov 14, 2022
acf1a9b
Move single-context globals to the ignored list.
ericsnowcurrently Nov 14, 2022
72492eb
Add a TODO comment about leaked memory.
ericsnowcurrently Nov 14, 2022
c908958
Move more globals to the ignored list.
ericsnowcurrently Nov 14, 2022
5357ea4
Re-organize the ignored list a tiny bit.
ericsnowcurrently Nov 14, 2022
6a3fb95
Move more globals to the ignored list.
ericsnowcurrently Nov 14, 2022
efad4c3
Only generate the version & build info once.
ericsnowcurrently Nov 14, 2022
3c97f38
Tweak the ignored list.
ericsnowcurrently Nov 14, 2022
b9df429
Move _Py_tracemalloc_config to _PyRuntimeState.
ericsnowcurrently Nov 14, 2022
a0a961e
Adjust the whitelist.
ericsnowcurrently Nov 14, 2022
c7e4333
Move the Bigint freelist to _PyRuntimeState.
ericsnowcurrently Nov 14, 2022
5c4fde4
Move the Bigint preallocated memory to _PyRuntimeState.
ericsnowcurrently Nov 14, 2022
3d803e9
Move static_arg_parsers into _PyRuntimeState.
ericsnowcurrently Nov 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
Prev Previous commit
Move static_arg_parsers into _PyRuntimeState.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Nov 14, 2022
commit 3d803e9ef6942d067fd3c1daa3b2f303331fdef8
1 change: 1 addition & 0 deletions Include/internal/pycore_interp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ extern "C" {
#include "pycore_unicodeobject.h" // struct _Py_unicode_state
#include "pycore_warnings.h" // struct _warnings_runtime_state


struct _pending_calls {
PyThread_type_lock lock;
/* Request for running pending calls. */
Expand Down
3 changes: 2 additions & 1 deletion Include/internal/pycore_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ extern "C" {
#include "pycore_unicodeobject.h" // struct _Py_unicode_runtime_ids

struct _getargs_runtime_state {
PyThread_type_lock mutex;
PyThread_type_lock mutex;
struct _PyArg_Parser *static_parsers;
};

/* ceval state */
Expand Down
11 changes: 4 additions & 7 deletions Python/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1846,9 +1846,6 @@ vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
}


/* List of static parsers. */
static struct _PyArg_Parser *static_arg_parsers = NULL;

static int
scan_keywords(const char * const *keywords, int *ptotal, int *pposonly)
{
Expand Down Expand Up @@ -2024,8 +2021,8 @@ _parser_init(struct _PyArg_Parser *parser)
parser->initialized = owned ? 1 : -1;

assert(parser->next == NULL);
parser->next = static_arg_parsers;
static_arg_parsers = parser;
parser->next = _PyRuntime.getargs.static_parsers;
_PyRuntime.getargs.static_parsers = parser;
return 1;
}

Expand Down Expand Up @@ -2930,14 +2927,14 @@ _PyArg_NoKwnames(const char *funcname, PyObject *kwnames)
void
_PyArg_Fini(void)
{
struct _PyArg_Parser *tmp, *s = static_arg_parsers;
struct _PyArg_Parser *tmp, *s = _PyRuntime.getargs.static_parsers;
while (s) {
tmp = s->next;
s->next = NULL;
parser_clear(s);
s = tmp;
}
static_arg_parsers = NULL;
_PyRuntime.getargs.static_parsers = NULL;
}

#ifdef __cplusplus
Expand Down
3 changes: 0 additions & 3 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 @@ -327,9 +327,6 @@ Objects/unicodeobject.c - ucnhash_capi -
# local buffer
Python/suggestions.c levenshtein_distance buffer -

# linked list
Python/getargs.c - static_arg_parsers -

# other
Objects/dictobject.c - _pydict_global_version -
Objects/dictobject.c - next_dict_keys_version -
Expand Down