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
ericsnowcurrently wants to merge 9 commits into from
Closed

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

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
Always use the main interpreter when possibly resizing the interned d… 
…ict.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 20, 2023
commit 5d6e1b955684a60dbc0db7941fa8e490c842c96e
16 changes: 14 additions & 2 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14617,14 +14617,26 @@ store_interned(PyObject *obj)
PyObject *interned = get_interned_dict();
assert(interned != NULL);

// XXX Swap to the main interpreter.
/* Swap to the main interpreter, if necessary. */
PyThreadState *oldts = NULL;
if (!_Py_IsMainInterpreter(_PyInterpreterState_GET())) {
PyThreadState *main_tstate = get_interned_tstate();
if (main_tstate == NULL) {
return NULL;
}
oldts = PyThreadState_Swap(main_tstate);
assert(oldts != NULL);
}

PyObject *t = PyDict_SetDefault(interned, obj, obj);
if (t == NULL) {
PyErr_Clear();
}

// XXX Swap back.
/* Swap back. */
if (oldts != NULL) {
PyThreadState_Swap(oldts);
}

return t;
}
Expand Down