8000 gh-112075: Make PyDictKeysObject thread-safe by DinoV · Pull Request #114741 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-112075: Make PyDictKeysObject thread-safe #114741

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 6 commits into from
Feb 21, 2024
Merged

gh-112075: Make PyDictKeysObject thread-safe #114741

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4715734
Make PyDictKeysObject thread-safe
DinoV Jan 22, 2024
18d2916
Fix naming of unsplit -> combined
DinoV Jan 31, 2024
61caf84
Lock less and deal with atomic updates to shared size
DinoV Feb 2, 2024
268c806
Address review feedback
DinoV Feb 8, 2024
7407ce9
Lock in dictresize, not in callers
DinoV Feb 15, 2024
a9d3666
Fixup recursive locking
DinoV Feb 20, 2024
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
Fixup recursive locking
  • Loading branch information
@DinoV
DinoV committed Feb 21, 2024
commit a9d3666dbe9983fd0e938f3f082849fecb444ed9
42 changes: 8 additions & 34 deletions Objects/dictobject.c
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -1342,10 +1342,8 @@ insert_split_dict(PyInterpreterState *interp, PyDictObject *mp,
LOCK_KEYS(keys);
if (keys->dk_usable <= 0) {
/* Need to resize. */
dictkeys_incref(keys);
int ins = insertion_resize(interp, mp, 1);
dictkeys_decref(interp, keys);
UNLOCK_KEYS(keys);
int ins = insertion_resize(interp, mp, 1);
if (ins < 0) {
return -1;
}
Expand All @@ -1371,30 +1369,6 @@ insert_split_dict(PyInterpreterState *interp, PyDictObject *mp,
return 0;
}

static int
convert_to_nonunicode_keys(PyInterpreterState *interp, PyDictObject *mp)
{
PyDictKeysObject *keys = mp->ma_keys;
if (_PyDict_HasSplitTable(mp)) {
LOCK_KEYS(keys);
dictkeys_incref(keys);
} else {
keys = NULL;
}

int res = insertion_resize(interp, mp, 0);

if (keys != NULL) {
dictkeys_decref(interp, keys);
UNLOCK_KEYS(keys);
}
if (res < 0) {
return res;
}
assert(mp->ma_keys->dk_kind == DICT_KEYS_GENERAL);
return 0;
}

/*
Internal routine to insert a new item into the table.
Used both by the internal resize routine and by the public insert routine.
Expand All @@ -1410,9 +1384,9 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp,
ASSERT_DICT_LOCKED(mp);

if (DK_IS_UNICODE(mp->ma_keys) && !PyUnicode_CheckExact(key)) {
if (convert_to_nonunicode_keys(interp, mp) < 0) {
if (insertion_resize(interp, mp, 0) < 0)
goto Fail;
}
assert(mp->ma_keys->dk_kind == DICT_KEYS_GENERAL);
}

Py_ssize_t ix = _Py_dict_lookup(mp, key, hash, &old_value);
Expand All @@ -1432,7 +1406,8 @@ insertdict(PyInterpreterState *interp, PyDictObject *mp,
if (insert_combined_dict(interp, mp, hash, key, value) < 0) {
goto Fail;
}
} else {
}
else {
if (insert_split_dict(interp, mp, hash, key, value) < 0)
goto Fail;
}
Expand Down Expand Up @@ -3803,7 +3778,7 @@ dict_setdefault_ref_lock_held(PyObject *d, PyObject *key, PyObject *default_valu
}

if (!PyUnicode_CheckExact(key) && DK_IS_UNICODE(mp->ma_keys)) {
if (convert_to_nonunicode_keys(interp, mp) < 0) {
if (insertion_resize(interp, mp, 0) < 0) {
if (result) {
*result = NULL;
}
Expand Down Expand Up @@ -3834,7 +3809,8 @@ dict_setdefault_ref_lock_held(PyObject *d, PyObject *key, PyObject *default_valu
}
return -1;
}
} else {
}
else {
if (insert_split_dict(interp, mp, hash, Py_NewRef(key), Py_NewRef(value)) < 0) {
Py_DECREF(key);
Py_DECREF(value);
Expand Down Expand Up @@ -3997,8 +3973,6 @@ dict_popitem_impl(PyDictObject *self)
}
/* Convert split table to combined table */
if (_PyDict_HasSplitTable(self)) {
PyDictKeysObject *keys = self->ma_keys;

if (dictresize(interp, self, DK_LOG_SIZE(self->ma_keys), 1) < 0) {
Py_DECREF(res);
return NULL;
Expand Down
0