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

gh-112087: Make list.sort to be thread-safe for PEP 703. (gh-116553)

This commit is contained in:
Donghee Na 2024-03-10 09:45:42 +09:00 committed by GitHub
parent 17d31bf384
commit 5b2f21faf3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,7 +268,9 @@ list_sort(PyListObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject
goto exit; goto exit;
} }
skip_optional_kwonly: skip_optional_kwonly:
Py_BEGIN_CRITICAL_SECTION(self);
return_value = list_sort_impl(self, keyfunc, reverse); return_value = list_sort_impl(self, keyfunc, reverse);
Py_END_CRITICAL_SECTION();
exit: exit:
return return_value; return return_value;
@ -452,4 +454,4 @@ list___reversed__(PyListObject *self, PyObject *Py_UNUSED(ignored))
{ {
return list___reversed___impl(self); return list___reversed___impl(self);
} }
/*[clinic end generated code: output=26dfb2c9846348f9 input=a9049054013a1b77]*/ /*[clinic end generated code: output=a77eda9931ec0c20 input=a9049054013a1b77]*/

11
Objects/listobject.c
View File

@ -2577,6 +2577,7 @@ unsafe_tuple_compare(PyObject *v, PyObject *w, MergeState *ms)
* duplicated). * duplicated).
*/ */
/*[clinic input] /*[clinic input]
@critical_section
list.sort list.sort
* *
@ -2596,7 +2597,7 @@ The reverse flag can be set to sort in descending order.
static PyObject * static PyObject *
list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse) list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse)
/*[clinic end generated code: output=57b9f9c5e23fbe42 input=a74c4cd3ec6b5c08]*/ /*[clinic end generated code: output=57b9f9c5e23fbe42 input=667bf25d0e3a3676]*/
{ {
MergeState ms; MergeState ms;
Py_ssize_t nremaining; Py_ssize_t nremaining;
@ -2623,7 +2624,7 @@ list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse)
saved_ob_item = self->ob_item; saved_ob_item = self->ob_item;
saved_allocated = self->allocated; saved_allocated = self->allocated;
Py_SET_SIZE(self, 0); Py_SET_SIZE(self, 0);
self->ob_item = NULL; FT_ATOMIC_STORE_PTR_RELEASE(self->ob_item, NULL);
self->allocated = -1; /* any operation will reset it to >= 0 */ self->allocated = -1; /* any operation will reset it to >= 0 */
if (keyfunc == NULL) { if (keyfunc == NULL) {
@ -2843,8 +2844,8 @@ keyfunc_fail:
final_ob_item = self->ob_item; final_ob_item = self->ob_item;
i = Py_SIZE(self); i = Py_SIZE(self);
Py_SET_SIZE(self, saved_ob_size); Py_SET_SIZE(self, saved_ob_size);
self->ob_item = saved_ob_item; FT_ATOMIC_STORE_PTR_RELEASE(self->ob_item, saved_ob_item);
self->allocated = saved_allocated; FT_ATOMIC_STORE_SSIZE_RELAXED(self->allocated, saved_allocated);
if (final_ob_item != NULL) { if (final_ob_item != NULL) {
/* we cannot use list_clear() for this because it does not /* we cannot use list_clear() for this because it does not
guarantee that the list is really empty when it returns */ guarantee that the list is really empty when it returns */
@ -2870,7 +2871,9 @@ PyList_Sort(PyObject *v)
PyErr_BadInternalCall(); PyErr_BadInternalCall();
return -1; return -1;
} }
Py_BEGIN_CRITICAL_SECTION(v);
v = list_sort_impl((PyListObject *)v, NULL, 0); v = list_sort_impl((PyListObject *)v, NULL, 0);
Py_END_CRITICAL_SECTION();
if (v == NULL) if (v == NULL)
return -1; return -1;
Py_DECREF(v); Py_DECREF(v);