gh-112087: Make list.sort to be thread-safe for PEP 703. by corona10 · Pull Request #116553 · python/cpython
Expand Up
@@ -2577,6 +2577,7 @@ unsafe_tuple_compare(PyObject *v, PyObject *w, MergeState *ms)
* duplicated).
*/
/*[clinic input]
@critical_section
list.sort
* Expand All @@ -2596,7 +2597,7 @@ The reverse flag can be set to sort in descending order.
static PyObject * 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; Py_ssize_t nremaining; Expand All @@ -2623,7 +2624,7 @@ list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse) saved_ob_item = self->ob_item; saved_allocated = self->allocated; 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 */
if (keyfunc == NULL) { Expand Down Expand Up @@ -2843,8 +2844,8 @@ list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse) final_ob_item = self->ob_item; i = Py_SIZE(self); Py_SET_SIZE(self, saved_ob_size); self->ob_item = saved_ob_item; self->allocated = saved_allocated; FT_ATOMIC_STORE_PTR_RELEASE(self->ob_item, saved_ob_item); FT_ATOMIC_STORE_SSIZE_RELAXED(self->allocated, saved_allocated); if (final_ob_item != NULL) { /* we cannot use list_clear() for this because it does not guarantee that the list is really empty when it returns */ Expand All @@ -2870,7 +2871,9 @@ PyList_Sort(PyObject *v) PyErr_BadInternalCall(); return -1; } Py_BEGIN_CRITICAL_SECTION(v); v = list_sort_impl((PyListObject *)v, NULL, 0); Py_END_CRITICAL_SECTION(); if (v == NULL) return -1; Py_DECREF(v); Expand Down
* Expand All @@ -2596,7 +2597,7 @@ The reverse flag can be set to sort in descending order.
static PyObject * 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; Py_ssize_t nremaining; Expand All @@ -2623,7 +2624,7 @@ list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse) saved_ob_item = self->ob_item; saved_allocated = self->allocated; Py_SET_SIZE(self, 0); self->ob_item = NULL; FT_ATOMIC_STORE_PTR_RELEASE(self->ob_item, NULL);
Comment thread
colesbury marked this conversation as resolved.
if (keyfunc == NULL) { Expand Down Expand Up @@ -2843,8 +2844,8 @@ list_sort_impl(PyListObject *self, PyObject *keyfunc, int reverse) final_ob_item = self->ob_item; i = Py_SIZE(self); Py_SET_SIZE(self, saved_ob_size); self->ob_item = saved_ob_item; self->allocated = saved_allocated; FT_ATOMIC_STORE_PTR_RELEASE(self->ob_item, saved_ob_item); FT_ATOMIC_STORE_SSIZE_RELAXED(self->allocated, saved_allocated); if (final_ob_item != NULL) { /* we cannot use list_clear() for this because it does not guarantee that the list is really empty when it returns */ Expand All @@ -2870,7 +2871,9 @@ PyList_Sort(PyObject *v) PyErr_BadInternalCall(); return -1; } Py_BEGIN_CRITICAL_SECTION(v); v = list_sort_impl((PyListObject *)v, NULL, 0); Py_END_CRITICAL_SECTION(); if (v == NULL) return -1; Py_DECREF(v); Expand Down