Skip to content

gh-112087: Make __sizeof__ and listiter_{len, next} to be threadsafe #114843

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 13 commits into from
Feb 14, 2024
Merged

gh-112087: Make __sizeof__ and listiter_{len, next} to be threadsafe #114843

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7186522
gh-112087: Make __sizeof__ and listiter_{len, next} to be threadsafe
corona10 Feb 1, 2024
e8be089
Fix typo
corona10 Feb 1, 2024
777c9d5
nit
corona10 Feb 1, 2024
671a1bc
Address code review
corona10 Feb 3, 2024
61362aa
Merge remote-tracking branch 'upstream/main' into gh-112087-part3
corona10 Feb 7, 2024
a93faf6
Address code review
corona10 Feb 8, 2024
44f2022
Address code review
corona10 Feb 9, 2024
79989db
nit
corona10 Feb 9, 2024
f4526f9
fix
corona10 Feb 9, 2024
a13beed
Address code review
corona10 Feb 14, 2024
bec617a
Address code review
corona10 Feb 14, 2024
6e170cc
Address code review
corona10 Feb 14, 2024
c8a8b81
Address code review
corona10 Feb 14, 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 Feb 3, 2024
commit 671a1bc8a8aa579dd857a515d8ec37a21e38a8d4
16 changes: 8 additions & 8 deletions Objects/listobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ class list "PyListObject *" "&PyList_Type"
_Py_DECLARE_STR(list_err, "list index out of range");

#ifdef Py_GIL_DISABLED
#define LOAD_SSIZE_ATOMIC_AS_POSSIBLE(value) _Py_atomic_load_ssize_relaxed(&value)
#define STORE_SSIZE_ATOMIC_AS_POSSIBLE(value, new_value) _Py_atomic_store_ssize_relaxed(&value, new_value)
#define LOAD_SSIZE(value) _Py_atomic_load_ssize_relaxed(&value)
#define STORE_SSIZE(value, new_value) _Py_atomic_store_ssize_relaxed(&value, new_value)
#else
#define LOAD_SSIZE_ATOMIC_AS_POSSIBLE(value) value
#define STORE_SSIZE_ATOMIC_AS_POSSIBLE(value, new_value) value = new_value
#define LOAD_SSIZE(value) value
#define STORE_SSIZE(value, new_value) value = new_value
#endif

#ifdef WITH_FREELISTS
Expand Down Expand Up @@ -2956,7 +2956,7 @@ list___sizeof___impl(PyListObject *self)
/*[clinic end generated code: output=3417541f95f9a53e input=b8030a5d5ce8a187]*/
{
size_t res = _PyObject_SIZE(Py_TYPE(self));
Py_ssize_t allocated = LOAD_SSIZE_ATOMIC_AS_POSSIBLE(self->allocated);
Py_ssize_t allocated = LOAD_SSIZE(self->allocated);
res += (size_t)allocated * sizeof(void*);
return PyLong_FromSize_t(res);
}
Expand Down Expand Up @@ -3384,7 +3384,7 @@ listiter_len(PyObject *self, PyObject *Py_UNUSED(ignored))
{
_PyListIterObject *it = (_PyListIterObject *)self;
Py_ssize_t len;
Py_ssize_t index = LOAD_SSIZE_ATOMIC_AS_POSSIBLE(it->it_index);
Py_ssize_t index = LOAD_SSIZE(it->it_index);
if (it->it_seq) {
len = PyList_GET_SIZE(it->it_seq) - index;
if (len >= 0)
Expand Down Expand Up @@ -3524,13 +3524,13 @@ listreviter_next(PyObject *self)
}
assert(PyList_Check(seq));

index = LOAD_SSIZE_ATOMIC_AS_POSSIBLE(it->it_index);
index = LOAD_SSIZE(it->it_index);
if (index>=0 && index < PyList_GET_SIZE(seq)) {
item = PyList_GET_ITEM(seq, index);
it->it_index--;
return Py_NewRef(item);
}
STORE_SSIZE_ATOMIC_AS_POSSIBLE(it->it_index, -1);
STORE_SSIZE(it->it_index, -1);
Comment thread
colesbury marked this conversation as resolved.
it->it_seq = NULL;
Py_DECREF(seq);
return NULL;
Expand Down