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

gh-116621: Set manual critical section for list.extend (gh-116657)

This commit is contained in:
Donghee Na 2024-03-13 07:28:23 +09:00 committed by GitHub
parent 126186674e
commit 3325699ffa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 98 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Objects/clinic/listobject.c.h generated
View File

@ -125,29 +125,14 @@ list_append(PyListObject *self, PyObject *object)
return return_value; return return_value;
} }
PyDoc_STRVAR(py_list_extend__doc__, PyDoc_STRVAR(list_extend__doc__,
"extend($self, iterable, /)\n" "extend($self, iterable, /)\n"
"--\n" "--\n"
"\n" "\n"
"Extend list by appending elements from the iterable."); "Extend list by appending elements from the iterable.");
#define PY_LIST_EXTEND_METHODDEF \ #define LIST_EXTEND_METHODDEF \
{"extend", (PyCFunction)py_list_extend, METH_O, py_list_extend__doc__}, {"extend", (PyCFunction)list_extend, METH_O, list_extend__doc__},
static PyObject *
py_list_extend_impl(PyListObject *self, PyObject *iterable);
static PyObject *
py_list_extend(PyListObject *self, PyObject *iterable)
{
PyObject *return_value = NULL;
Py_BEGIN_CRITICAL_SECTION2(self, iterable);
return_value = py_list_extend_impl(self, iterable);
Py_END_CRITICAL_SECTION2();
return return_value;
}
PyDoc_STRVAR(list_pop__doc__, PyDoc_STRVAR(list_pop__doc__,
"pop($self, index=-1, /)\n" "pop($self, index=-1, /)\n"
@ -454,4 +439,4 @@ list___reversed__(PyListObject *self, PyObject *Py_UNUSED(ignored))
{ {
return list___reversed___impl(self); return list___reversed___impl(self);
} }
/*[clinic end generated code: output=a77eda9931ec0c20 input=a9049054013a1b77]*/ /*[clinic end generated code: output=854957a1d4a89bbd input=a9049054013a1b77]*/

136
Objects/listobject.c
View File

@ -10,6 +10,7 @@
#include "pycore_modsupport.h" // _PyArg_NoKwnames() #include "pycore_modsupport.h" // _PyArg_NoKwnames()
#include "pycore_object.h" // _PyObject_GC_TRACK(), _PyDebugAllocatorStats() #include "pycore_object.h" // _PyObject_GC_TRACK(), _PyDebugAllocatorStats()
#include "pycore_tuple.h" // _PyTuple_FromArray() #include "pycore_tuple.h" // _PyTuple_FromArray()
#include "pycore_setobject.h" // _PySet_NextEntry()
#include <stddef.h> #include <stddef.h>
/*[clinic input] /*[clinic input]
@ -994,26 +995,28 @@ PyList_SetSlice(PyObject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v)
return list_ass_slice((PyListObject *)a, ilow, ihigh, v); return list_ass_slice((PyListObject *)a, ilow, ihigh, v);
} }
static PyObject * static int
list_inplace_repeat_lock_held(PyListObject *self, Py_ssize_t n) list_inplace_repeat_lock_held(PyListObject *self, Py_ssize_t n)
{ {
Py_ssize_t input_size = PyList_GET_SIZE(self); Py_ssize_t input_size = PyList_GET_SIZE(self);
if (input_size == 0 || n == 1) { if (input_size == 0 || n == 1) {
return Py_NewRef(self); return 0;
} }
if (n < 1) { if (n < 1) {
list_clear(self); list_clear(self);
return Py_NewRef(self); return 0;
} }
if (input_size > PY_SSIZE_T_MAX / n) { if (input_size > PY_SSIZE_T_MAX / n) {
return PyErr_NoMemory(); PyErr_NoMemory();
return -1;
} }
Py_ssize_t output_size = input_size * n; Py_ssize_t output_size = input_size * n;
if (list_resize(self, output_size) < 0) if (list_resize(self, output_size) < 0) {
return NULL; return -1;
}
PyObject **items = self->ob_item; PyObject **items = self->ob_item;
for (Py_ssize_t j = 0; j < input_size; j++) { for (Py_ssize_t j = 0; j < input_size; j++) {
@ -1021,8 +1024,7 @@ list_inplace_repeat_lock_held(PyListObject *self, Py_ssize_t n)
} }
_Py_memory_repeat((char *)items, sizeof(PyObject *)*output_size, _Py_memory_repeat((char *)items, sizeof(PyObject *)*output_size,
sizeof(PyObject *)*input_size); sizeof(PyObject *)*input_size);
return 0;
return Py_NewRef(self);
} }
static PyObject * static PyObject *
@ -1031,7 +1033,12 @@ list_inplace_repeat(PyObject *_self, Py_ssize_t n)
PyObject *ret; PyObject *ret;
PyListObject *self = (PyListObject *) _self; PyListObject *self = (PyListObject *) _self;
Py_BEGIN_CRITICAL_SECTION(self); Py_BEGIN_CRITICAL_SECTION(self);
ret = list_inplace_repeat_lock_held(self, n); if (list_inplace_repeat_lock_held(self, n) < 0) {
ret = NULL;
}
else {
ret = Py_NewRef(self);
}
Py_END_CRITICAL_SECTION(); Py_END_CRITICAL_SECTION();
return ret; return ret;
} }
@ -1179,7 +1186,7 @@ list_extend_fast(PyListObject *self, PyObject *iterable)
} }
static int static int
list_extend_iter(PyListObject *self, PyObject *iterable) list_extend_iter_lock_held(PyListObject *self, PyObject *iterable)
{ {
PyObject *it = PyObject_GetIter(iterable); PyObject *it = PyObject_GetIter(iterable);
if (it == NULL) { if (it == NULL) {
@ -1253,45 +1260,78 @@ list_extend_iter(PyListObject *self, PyObject *iterable)
return -1; return -1;
} }
static int static int
list_extend(PyListObject *self, PyObject *iterable) list_extend_lock_held(PyListObject *self, PyObject *iterable)
{ {
// Special cases: PyObject *seq = PySequence_Fast(iterable, "argument must be iterable");
// 1) lists and tuples which can use PySequence_Fast ops if (!seq) {
// 2) extending self to self requires making a copy first
if (PyList_CheckExact(iterable)
|| PyTuple_CheckExact(iterable)
|| (PyObject *)self == iterable)
{
iterable = PySequence_Fast(iterable, "argument must be iterable");
if (!iterable) {
return -1; return -1;
} }
int res = list_extend_fast(self, iterable); int res = list_extend_fast(self, seq);
Py_DECREF(iterable); Py_DECREF(seq);
return res; return res;
}
static int
list_extend_set(PyListObject *self, PySetObject *other)
{
Py_ssize_t m = Py_SIZE(self);
Py_ssize_t n = PySet_GET_SIZE(other);
if (list_resize(self, m + n) < 0) {
return -1;
}
/* populate the end of self with iterable's items */
Py_ssize_t setpos = 0;
Py_hash_t hash;
PyObject *key;
PyObject **dest = self->ob_item + m;
while (_PySet_NextEntry((PyObject *)other, &setpos, &key, &hash)) {
Py_INCREF(key);
*dest = key;
dest++;
}
Py_SET_SIZE(self, m + n);
return 0;
}
static int
_list_extend(PyListObject *self, PyObject *iterable)
{
// Special case:
// lists and tuples which can use PySequence_Fast ops
// TODO(@corona10): Add more special cases for other types.
int res = -1;
if ((PyObject *)self == iterable) {
Py_BEGIN_CRITICAL_SECTION(self);
res = list_inplace_repeat_lock_held(self, 2);
Py_END_CRITICAL_SECTION();
}
else if (PyList_CheckExact(iterable)) {
Py_BEGIN_CRITICAL_SECTION2(self, iterable);
res = list_extend_lock_held(self, iterable);
Py_END_CRITICAL_SECTION2();
}
else if (PyTuple_CheckExact(iterable)) {
Py_BEGIN_CRITICAL_SECTION(self);
res = list_extend_lock_held(self, iterable);
Py_END_CRITICAL_SECTION();
}
else if (PyAnySet_CheckExact(iterable)) {
Py_BEGIN_CRITICAL_SECTION2(self, iterable);
res = list_extend_set(self, (PySetObject *)iterable);
Py_END_CRITICAL_SECTION2();
} }
else { else {
return list_extend_iter(self, iterable); Py_BEGIN_CRITICAL_SECTION(self);
res = list_extend_iter_lock_held(self, iterable);
Py_END_CRITICAL_SECTION();
} }
return res;
} }
PyObject *
_PyList_Extend(PyListObject *self, PyObject *iterable)
{
if (list_extend(self, iterable) < 0) {
return NULL;
}
Py_RETURN_NONE;
}
/*[clinic input] /*[clinic input]
@critical_section self iterable list.extend as list_extend
list.extend as py_list_extend
iterable: object iterable: object
/ /
@ -1300,12 +1340,20 @@ Extend list by appending elements from the iterable.
[clinic start generated code]*/ [clinic start generated code]*/
static PyObject * static PyObject *
py_list_extend_impl(PyListObject *self, PyObject *iterable) list_extend(PyListObject *self, PyObject *iterable)
/*[clinic end generated code: output=a2f115ceace2c845 input=1d42175414e1a5f3]*/ /*[clinic end generated code: output=630fb3bca0c8e789 input=979da7597a515791]*/
{ {
return _PyList_Extend(self, iterable); if (_list_extend(self, iterable) < 0) {
return NULL;
}
Py_RETURN_NONE;
} }
PyObject *
_PyList_Extend(PyListObject *self, PyObject *iterable)
{
return list_extend(self, iterable);
}
int int
PyList_Extend(PyObject *self, PyObject *iterable) PyList_Extend(PyObject *self, PyObject *iterable)
@ -1314,7 +1362,7 @@ PyList_Extend(PyObject *self, PyObject *iterable)
PyErr_BadInternalCall(); PyErr_BadInternalCall();
return -1; return -1;
} }
return list_extend((PyListObject*)self, iterable); return _list_extend((PyListObject*)self, iterable);
} }
@ -1334,7 +1382,7 @@ static PyObject *
list_inplace_concat(PyObject *_self, PyObject *other) list_inplace_concat(PyObject *_self, PyObject *other)
{ {
PyListObject *self = (PyListObject *)_self; PyListObject *self = (PyListObject *)_self;
if (list_extend(self, other) < 0) { if (_list_extend(self, other) < 0) {
return NULL; return NULL;
} }
return Py_NewRef(self); return Py_NewRef(self);
@ -3168,7 +3216,7 @@ list___init___impl(PyListObject *self, PyObject *iterable)
list_clear(self); list_clear(self);
} }
if (iterable != NULL) { if (iterable != NULL) {
if (list_extend(self, iterable) < 0) { if (_list_extend(self, iterable) < 0) {
return -1; return -1;
} }
} }
@ -3229,7 +3277,7 @@ static PyMethodDef list_methods[] = {
LIST_COPY_METHODDEF LIST_COPY_METHODDEF
LIST_APPEND_METHODDEF LIST_APPEND_METHODDEF
LIST_INSERT_METHODDEF LIST_INSERT_METHODDEF
PY_LIST_EXTEND_METHODDEF LIST_EXTEND_METHODDEF
LIST_POP_METHODDEF LIST_POP_METHODDEF
LIST_REMOVE_METHODDEF LIST_REMOVE_METHODDEF
LIST_INDEX_METHODDEF LIST_INDEX_METHODDEF