Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-112087: Use QSBR technique for list_new/clear for free-thread build (gh-115875)

This commit is contained in:
Donghee Na 2024-03-02 08:30:35 +09:00 committed by GitHub
parent 90a1e9880f
commit fb5e0344e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Objects/listobject.c
View File

@ -502,7 +502,16 @@ list_item(PyObject *aa, Py_ssize_t i)
PyErr_SetObject(PyExc_IndexError, &_Py_STR(list_err)); PyErr_SetObject(PyExc_IndexError, &_Py_STR(list_err));
return NULL; return NULL;
} }
return Py_NewRef(a->ob_item[i]); PyObject *item;
Py_BEGIN_CRITICAL_SECTION(a);
#ifdef Py_GIL_DISABLED
if (!_Py_IsOwnedByCurrentThread((PyObject *)a) && !_PyObject_GC_IS_SHARED(a)) {
_PyObject_GC_SET_SHARED(a);
}
#endif
item = Py_NewRef(a->ob_item[i]);
Py_END_CRITICAL_SECTION();
return item;
} }
static PyObject * static PyObject *
@ -658,7 +667,7 @@ list_repeat(PyObject *aa, Py_ssize_t n)
} }
static void static void
list_clear(PyListObject *a) list_clear_impl(PyListObject *a, bool is_resize)
{ {
PyObject **items = a->ob_item; PyObject **items = a->ob_item;
if (items == NULL) { if (items == NULL) {
@ -674,17 +683,31 @@ list_clear(PyListObject *a)
while (--i >= 0) { while (--i >= 0) {
Py_XDECREF(items[i]); Py_XDECREF(items[i]);
} }
// TODO: Use QSBR technique, if the list is shared between threads, #ifdef Py_GIL_DISABLED
PyMem_Free(items); bool use_qsbr = is_resize && _PyObject_GC_IS_SHARED(a);
#else
bool use_qsbr = false;
#endif
if (use_qsbr) {
_PyMem_FreeDelayed(items);
}
else {
PyMem_Free(items);
}
// Note that there is no guarantee that the list is actually empty // Note that there is no guarantee that the list is actually empty
// at this point, because XDECREF may have populated it indirectly again! // at this point, because XDECREF may have populated it indirectly again!
} }
static void
list_clear(PyListObject *a)
{
list_clear_impl(a, true);
}
static int static int
list_clear_slot(PyObject *self) list_clear_slot(PyObject *self)
{ {
list_clear((PyListObject *)self); list_clear_impl((PyListObject *)self, false);
return 0; return 0;
} }