Skip to content

gh-112087: Make list_{slice, ass_slice, subscript} to be threadsafe #116233

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
corona10 merged 12 commits into from
Mar 5, 2024
Merged

gh-112087: Make list_{slice, ass_slice, subscript} to be threadsafe #116233

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d9ffc53
gh-112087: Make list_{slice, ass_slice, subscript} to be threadsafe
corona10 Mar 2, 2024
cab2d99
Remove unnecessary atomic operations
corona10 Mar 4, 2024
8b0120d
Update
corona10 Mar 4, 2024
1e19253
Address code review
corona10 Mar 5, 2024
c25ca79
nit
corona10 Mar 5, 2024
1ed3329
Change name
corona10 Mar 5, 2024
033c141
Fix
corona10 Mar 5, 2024
12529a8
Remove inline
corona10 Mar 5, 2024
3335211
fix
corona10 Mar 5, 2024
11b3017
Address code review
corona10 Mar 5, 2024
9ac76ca
Address code review
corona10 Mar 5, 2024
6c037d4
Add test case
corona10 Mar 5, 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
Next Next commit
Address code review
  • Loading branch information
@corona10
corona10 committed Mar 5, 2024
commit 1e19253357fedc9e0f56bb8148e129d6268cd138
32 changes: 23 additions & 9 deletions Objects/listobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ list_item(PyObject *aa, Py_ssize_t i)
}

static inline PyObject *
list_slice_impl(PyListObject *a, Py_ssize_t ilow, Py_ssize_t len)
list_slice_lock_held(PyListObject *a, Py_ssize_t ilow, Py_ssize_t len)
{
PyListObject *np = (PyListObject *) list_new_prealloc(len);
if (np == NULL) {
Expand All @@ -538,7 +538,11 @@ list_slice(PyListObject *a, Py_ssize_t ilow, Py_ssize_t ihigh)
if (len <= 0) {
return PyList_New(0);
}
return list_slice_impl(a, ilow, len);
PyObject *ret;
Py_BEGIN_CRITICAL_SECTION(a);
ret = list_slice_lock_held(a, ilow, len);
Py_END_CRITICAL_SECTION();
return ret;
}

PyObject *
Expand Down Expand Up @@ -824,7 +828,7 @@ list_ass_slice(PyListObject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v)
if (a == (PyListObject *)v) {
Py_BEGIN_CRITICAL_SECTION(a);
Py_ssize_t n = PyList_GET_SIZE(a);
PyObject *copy = list_slice_impl(a, 0, n);
PyObject *copy = list_slice_lock_held(a, 0, n);
if (copy == NULL) {
return -1;
}
Expand Down Expand Up @@ -978,7 +982,11 @@ static PyObject *
list_copy_impl(PyListObject *self)
/*[clinic end generated code: output=ec6b72d6209d418e input=81c54b0c7bb4f73d]*/
{
return list_slice(self, 0, Py_SIZE(self));
Py_ssize_t n = Py_SIZE(self);
if (n <= 0) {
return (PyObject *) PyList_New(0);
}
return list_slice_lock_held(self, 0, n);
}

/*[clinic input]
Expand Down Expand Up @@ -3107,7 +3115,7 @@ static PySequenceMethods list_as_sequence = {
};

static inline PyObject *
list_slice_step_impl(PyListObject *a, Py_ssize_t start, Py_ssize_t step, Py_ssize_t len)
list_slice_step_lock_held(PyListObject *a, Py_ssize_t start, Py_ssize_t step, Py_ssize_t len)
{
PyListObject *np = (PyListObject *)list_new_prealloc(len);
if (np == NULL) {
Expand Down Expand Up @@ -3137,10 +3145,10 @@ list_slice_wrap(PyListObject *aa, Py_ssize_t start, Py_ssize_t stop, Py_ssize_t
res = PyList_New(0);
}
else if (step == 1) {
res = list_slice_impl(a, start, len);
res = list_slice_lock_held(a, start, len);
}
else {
res = list_slice_step_impl(a, start, step, len);
res = list_slice_step_lock_held(a, start, step, len);
}
Py_END_CRITICAL_SECTION();
return res;
Expand Down Expand Up @@ -3275,8 +3283,14 @@ list_ass_subscript(PyObject* _self, PyObject* item, PyObject* value)

/* protect against a[::-1] = a */
if (self == (PyListObject*)value) {
seq = list_slice((PyListObject*)value, 0,
PyList_GET_SIZE(value));
Py_BEGIN_CRITICAL_SECTION(value);
Py_ssize_t size = Py_SIZE(value);
if (size <= 0) {
seq = PyList_New(0);
} else {
seq = list_slice_lock_held((PyListObject*)value, 0, size);
Comment thread
corona10 marked this conversation as resolved.
Outdated
}
Comment thread
corona10 marked this conversation as resolved.
Outdated
Py_END_CRITICAL_SECTION();
}
else {
seq = PySequence_Fast(value,
Expand Down