Skip to content

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

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

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
caec551
Drop outdated whitelist entries.
ericsnowcurrently Nov 15, 2022
f6b90ee
Move make_pending_calls():busy to _PyRuntimeState.
ericsnowcurrently Nov 15, 2022
a6be5a3
Move urandom_cache to _PyRuntimeState.
ericsnowcurrently Nov 15, 2022
fb33ede
Move float_format/double_format to _PyRuntimeState.
ericsnowcurrently Nov 15, 2022
bd1a66d
Special-case the hash secret.
ericsnowcurrently Nov 15, 2022
1da0a33
Re-organize the ingored list.
ericsnowcurrently Nov 15, 2022
03481e2
Drop an old global from the ingored list.
ericsnowcurrently Nov 15, 2022
e50ea07
Only initialize bloom_linebreak once in the process.
ericsnowcurrently Nov 15, 2022
a55e26a
Clarify an ignore list header.
ericsnowcurrently Nov 15, 2022
fd3ec40
Move memo_statistics to the ignored list.
ericsnowcurrently Nov 15, 2022
d04d9da
runtime.unicode_ids -> runtime.unicode_state.ids.
ericsnowcurrently Nov 15, 2022
4e13ded
Move force_ascii to _PyRuntimeState.
ericsnowcurrently Nov 15, 2022
e8ad283
Move _Py_PackageContext to _PyRuntimeState.
ericsnowcurrently Nov 15, 2022
22135f7
Move _Py_FatalErrorFormat():reentrant to the ignored list.
ericsnowcurrently Nov 15, 2022
426b34e
Move PyFPE_counter to the ignored list.
ericsnowcurrently Nov 15, 2022
ffdd34a
Move _Py_UnhandledKeyboardInterrupt to _PyRuntimeState.
ericsnowcurrently Nov 15, 2022
248a69c
Fix pyhash_runtime_state on Windows.
ericsnowcurrently Nov 15, 2022
a4a55d1
Fix pyhash_runtime_state on Windows.
ericsnowcurrently Nov 15, 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
Fix pyhash_runtime_state on Windows.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Nov 15, 2022
commit a4a55d1211e493d3aff03b1901dc91285b3286e8
23 changes: 19 additions & 4 deletions Include/internal/pycore_pyhash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,32 @@


struct pyhash_runtime_state {
// This is a placeholder so the struct isn't empty on Windows.
int _not_used;
#ifndef MS_WINDOWS
struct {
#ifndef MS_WINDOWS
int fd;
dev_t st_dev;
ino_t st_ino;
} urandom_cache;
#else
// This is a placeholder so the struct isn't empty on Windows.
int _not_used;
#endif
} urandom_cache;
};

#ifndef MS_WINDOWS
# define _py_urandom_cache_INIT \
{ \
.fd = -1, \
}
#else
# define _py_urandom_cache_INIT {0}
#endif

#define pyhash_state_INIT \
{ \
.urandom_cache = _py_urandom_cache_INIT, \
}


uint64_t _Py_KeyedHash(uint64_t, const char *, Py_ssize_t);

Expand Down
6 changes: 1 addition & 5 deletions Include/internal/pycore_runtime_init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ extern "C" {
_pymem_allocators_obj_arena_INIT, \
}, \
.obmalloc = _obmalloc_state_INIT(runtime.obmalloc), \
.pyhash_state = { \
.urandom_cache = { \
.fd = -1, \
}, \
}, \
.pyhash_state = pyhash_state_INIT, \
.interpreters = { \
/* This prevents interpreters from getting created \
until _PyInterpreterState_Enable() is called. */ \
Expand Down