8000 gh-100227: Make the Global Interned Dict Safe for Isolated Interpreters by ericsnowcurrently · Pull Request #102858 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-100227: Make the Global Interned Dict Safe for Isolated Interpreters #102858

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

Closed
wants to merge 9 commits into from
Closed

gh-100227: Make the Global Interned Dict Safe for Isolated Interpreters #102858

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9420a1c
Initialize the interned dict in _PyUnicode_InitGlobalObjects().
ericsnowcurrently Mar 13, 2023
cca77b9
Add some TODO comments.
ericsnowcurrently Mar 13, 2023
fa3974f
Factor out store_interned().
ericsnowcurrently Mar 20, 2023
eadd48a
Store a thread state to use just for interned strings.
ericsnowcurrently Mar 20, 2023
5d6e1b9
Always use the main interpreter when possibly resizing the interned d…
ericsnowcurrently Mar 20, 2023
16ed5e0
Make interned strings immortal.
ericsnowcurrently Mar 20, 2023
d36f119
Temporarily skip immortalizing.
ericsnowcurrently Mar 20, 2023
6d5f129
Add the mutex for the interned dict.
ericsnowcurrently Mar 20, 2023
b634920
Lock around store_interned().
ericsnowcurrently Mar 20, 2023
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
Add the mutex for the interned dict.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 20, 2023
commit 6d5f129fe234edf892a900c3f2fabce3508ca9ec
1 change: 1 addition & 0 deletions Include/internal/pycore_unicodeobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ struct _Py_unicode_runtime_ids {

struct _Py_unicode_runtime_state {
struct {
PyThread_type_lock lock;
PyThreadState *tstate;
/* The actual interned dict is at
_PyRuntime.cached_objects.interned_strings. */
Expand Down
23 changes: 19 additions & 4 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,8 @@ _Py_COMP_DIAG_POP

static int
alloc_for_runtime(PyThread_type_lock *plock1, PyThread_type_lock *plock2,
PyThread_type_lock *plock3, PyThread_type_lock *plock4)
PyThread_type_lock *plock3, PyThread_type_lock *plock4,
PyThread_type_lock *plock5)
{
/* Force default allocator, since _PyRuntimeState_Fini() must
use the same allocator than this function. */
Expand Down Expand Up @@ -389,12 +390,22 @@ alloc_for_runtime(PyThread_type_lock *plock1, PyThread_type_lock *plock2,
return -1;
}

PyThread_type_lock lock5 = PyThread_allocate_lock();
if (lock4 == NULL) {
PyThread_free_lock(lock1);
PyThread_free_lock(lock2);
PyThread_free_lock(lock3);
PyThread_free_lock(lock4);
return -1;
}

PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);

*plock1 = lock1;
*plock2 = lock2;
*plock3 = lock3;
*plock4 = lock4;
*plock5 = lock5;
return 0;
}

Expand All @@ -404,6 +415,7 @@ init_runtime(_PyRuntimeState *runtime,
_Py_AuditHookEntry *audit_hook_head,
Py_ssize_t unicode_next_index,
PyThread_type_lock unicode_ids_mutex,
PyThread_type_lock interned_mutex,
PyThread_type_lock interpreters_mutex,
PyThread_type_lock xidregistry_mutex,
PyThread_type_lock getargs_mutex)
Expand Down Expand Up @@ -435,6 +447,7 @@ init_runtime(_PyRuntimeState *runtime,

runtime->unicode_state.ids.next_index = unicode_next_index;
runtime->unicode_state.ids.lock = unicode_ids_mutex;
runtime->unicode_state.interned.lock = interned_mutex;

runtime->_initialized = 1;
}
Expand All @@ -452,8 +465,8 @@ _PyRuntimeState_Init(_PyRuntimeState *runtime)
// is called multiple times.
Py_ssize_t unicode_next_index = runtime->unicode_state.ids.next_index;

PyThread_type_lock lock1, lock2, lock3, lock4;
if (alloc_for_runtime(&lock1, &lock2, &lock3, &lock4) != 0) {
PyThread_type_lock lock1, lock2, lock3, lock4, lock5;
if (alloc_for_runtime(&lock1, &lock2, &lock3, &lock4, &lock5) != 0) {
return _PyStatus_NO_MEMORY();
}

Expand All @@ -474,7 +487,7 @@ _PyRuntimeState_Init(_PyRuntimeState *runtime)
}

init_runtime(runtime, open_code_hook, open_code_userdata, audit_hook_head,
unicode_next_index, lock1, lock2, lock3, lock4);
unicode_next_index, lock1, lock2, lock3, lock4, lock5);

return _PyStatus_OK();
}
Expand Down Expand Up @@ -530,6 +543,7 @@ _PyRuntimeState_ReInitThreads(_PyRuntimeState *runtime)
int reinit_interp = _PyThread_at_fork_reinit(&runtime->interpreters.mutex);
int reinit_xidregistry = _PyThread_at_fork_reinit(&runtime->xidregistry.mutex);
int reinit_unicode_ids = _PyThread_at_fork_reinit(&runtime->unicode_state.ids.lock);
int reinit_interned = _PyThread_at_fork_reinit(&runtime->unicode_state.interned.lock);
int reinit_getargs = _PyThread_at_fork_reinit(&runtime->getargs.mutex);

PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
Expand All @@ -542,6 +556,7 @@ _PyRuntimeState_ReInitThreads(_PyRuntimeState *runtime)
|| reinit_main_id < 0
|| reinit_xidregistry < 0
|| reinit_unicode_ids < 0
|| reinit_interned < 0
|| reinit_getargs < 0)
{
return _PyStatus_ERR("Failed to reinitialize runtime locks");
Expand Down
0