Skip to content

gh-112087: Make list_{count, index, contains} to be thread-safe. #114916

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

gh-112087: Make list_{count, index, contains} to be thread-safe. #114916

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b8ac83
gh-112087: Make list_{count, index, contains} to be thread-safe.
corona10 Feb 2, 2024
a702b04
Address code review
corona10 Feb 3, 2024
2e44fab
Address code review
corona10 Feb 5, 2024
853b314
Address code review
corona10 Feb 6, 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
52 changes: 33 additions & 19 deletions Objects/listobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,15 @@ PyList_GetItemRef(PyObject *op, Py_ssize_t i)
return Py_NewRef(PyList_GET_ITEM(op, i));
}

static inline PyObject*
list_get_item_ref(PyListObject *op, Py_ssize_t i)
{
if (!valid_index(i, Py_SIZE(op))) {
return NULL;
}
return Py_NewRef(PyList_GET_ITEM(op, i));
}

int
PyList_SetItem(PyObject *op, Py_ssize_t i,
PyObject *newitem)
Expand Down Expand Up @@ -478,18 +487,20 @@ list_length(PyObject *a)
static int
list_contains(PyObject *aa, PyObject *el)
{
PyListObject *a = (PyListObject *)aa;
PyObject *item;
Py_ssize_t i;
int cmp;

for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(a); ++i) {
item = PyList_GET_ITEM(a, i);
Py_INCREF(item);
cmp = PyObject_RichCompareBool(item, el, Py_EQ);
for (Py_ssize_t i = 0; ; i++) {
PyObject *item = list_get_item_ref((PyListObject *)aa, i);
if (item == NULL) {
// out-of-bounds
return 0;
}
int cmp = PyObject_RichCompareBool(item, el, Py_EQ);
Py_DECREF(item);
if (cmp != 0) {
return cmp;
}
}
return cmp;
return 0;
}

static PyObject *
Expand Down Expand Up @@ -2724,8 +2735,6 @@ list_index_impl(PyListObject *self, PyObject *value, Py_ssize_t start,
Py_ssize_t stop)
/*[clinic end generated code: output=ec51b88787e4e481 input=40ec5826303a0eb1]*/
{
Py_ssize_t i;

if (start < 0) {
start += Py_SIZE(self);
if (start < 0)
Expand All @@ -2736,9 +2745,12 @@ list_index_impl(PyListObject *self, PyObject *value, Py_ssize_t start,
if (stop < 0)
stop = 0;
}
for (i = start; i < stop && i < Py_SIZE(self); i++) {
PyObject *obj = self->ob_item[i];
Py_INCREF(obj);
for (Py_ssize_t i = start; i < stop; i++) {
PyObject *obj = list_get_item_ref(self, i);
if (obj == NULL) {
// out-of-bounds
break;
}
int cmp = PyObject_RichCompareBool(obj, value, Py_EQ);
Py_DECREF(obj);
if (cmp > 0)
Expand All @@ -2764,15 +2776,17 @@ list_count(PyListObject *self, PyObject *value)
/*[clinic end generated code: output=b1f5d284205ae714 input=3bdc3a5e6f749565]*/
{
Py_ssize_t count = 0;
Py_ssize_t i;

for (i = 0; i < Py_SIZE(self); i++) {
PyObject *obj = self->ob_item[i];
for (Py_ssize_t i = 0; ; i++) {
PyObject *obj = list_get_item_ref(self, i);
if (obj == NULL) {
// out-of-bounds
break;
}
if (obj == value) {
count++;
Py_DECREF(obj);
continue;
}
Py_INCREF(obj);
int cmp = PyObject_RichCompareBool(obj, value, Py_EQ);
Py_DECREF(obj);
if (cmp > 0)
Expand Down