Skip to content

gh-111971: Make _PyUnicode_FromId thread-safe in --disable-gil #113489

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 5 commits into from
Dec 26, 2023
Merged

gh-111971: Make _PyUnicode_FromId thread-safe in --disable-gil #113489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4644f71
gh-111971: Make _PyUnicode_FromId thread-safe in --disable-gil
corona10 Dec 26, 2023
175ca6b
Compiler warn
corona10 Dec 26, 2023
9f0cb0c
Address code review
corona10 Dec 26, 2023
7f97129
nit
corona10 Dec 26, 2023
0141796
nit
corona10 Dec 26, 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
4 changes: 4 additions & 0 deletions Include/cpython/object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ typedef struct _Py_Identifier {
// Index in PyInterpreterState.unicode.ids.array. It is process-wide
// unique and must be initialized to -1.
Py_ssize_t index;
// Hidden PyMutex struct for non free-threaded build.
struct {
uint8_t v;
} mutex;
} _Py_Identifier;

#ifndef Py_BUILD_CORE
Expand Down
10 changes: 7 additions & 3 deletions Objects/unicodeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1897,6 +1897,7 @@ PyUnicode_FromString(const char *u)
PyObject *
_PyUnicode_FromId(_Py_Identifier *id)
{
PyMutex_Lock((PyMutex *)&id->mutex);
PyInterpreterState *interp = _PyInterpreterState_GET();
struct _Py_unicode_ids *ids = &interp->unicode.ids;

Expand All @@ -1923,14 +1924,14 @@ _PyUnicode_FromId(_Py_Identifier *id)
obj = ids->array[index];
if (obj) {
// Return a borrowed reference
return obj;
goto end;
}
}

obj = PyUnicode_DecodeUTF8Stateful(id->string, strlen(id->string),
NULL, NULL);
if (!obj) {
return NULL;
goto end;
}
PyUnicode_InternInPlace(&obj);

Expand All @@ -1941,7 +1942,8 @@ _PyUnicode_FromId(_Py_Identifier *id)
PyObject **new_array = PyMem_Realloc(ids->array, new_size * item_size);
if (new_array == NULL) {
PyErr_NoMemory();
return NULL;
obj = NULL;
goto end;
}
memset(&new_array[ids->size], 0, (new_size - ids->size) * item_size);
ids->array = new_array;
Expand All @@ -1951,6 +1953,8 @@ _PyUnicode_FromId(_Py_Identifier *id)
// The array stores a strong reference
ids->array[index] = obj;

end:
PyMutex_Unlock((PyMutex *)&id->mutex);
// Return a borrowed reference
return obj;
}
Expand Down