From 022e2441d769b495ab16914402d60427518c103b Mon Sep 17 00:00:00 2001 From: Sam Gross Date: Fri, 19 Jul 2024 15:26:29 -0400 Subject: [PATCH] [3.13] gh-121621: Disable asyncio freelist in free-threaded build (GH-122046) The futureobj freelist isn't thread-safe. We intend to re-enable the freelist in a thread-safe way for 3.14 (but not 3.13). (cherry picked from commit 97248204a1cc10bd3a66ce857535d133f6bc86a1) Co-authored-by: Sam Gross --- Modules/_asynciomodule.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c index d7ddc8530dc153..23cbd48528e0f8 100644 --- a/Modules/_asynciomodule.c +++ b/Modules/_asynciomodule.c @@ -71,8 +71,10 @@ typedef struct { /* Counter for autogenerated Task names */ uint64_t task_name_counter; +#ifndef Py_GIL_DISABLED futureiterobject *fi_freelist; Py_ssize_t fi_freelist_len; +#endif } asyncio_state; static inline asyncio_state * @@ -1520,14 +1522,14 @@ FutureIter_dealloc(futureiterobject *it) assert(_PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE)); - PyObject *module = ((PyHeapTypeObject*)tp)->ht_module; - asyncio_state *state = NULL; - PyObject_GC_UnTrack(it); tp->tp_clear((PyObject *)it); +#ifndef Py_GIL_DISABLED // GH-115874: We can't use PyType_GetModuleByDef here as the type might have // already been cleared, which is also why we must check if ht_module != NULL. + PyObject *module = ((PyHeapTypeObject*)tp)->ht_module; + asyncio_state *state = NULL; if (module && _PyModule_GetDef(module) == &_asynciomodule) { state = get_asyncio_state(module); } @@ -1538,7 +1540,9 @@ FutureIter_dealloc(futureiterobject *it) it->future = (FutureObj*) state->fi_freelist; state->fi_freelist = it; } - else { + else +#endif + { PyObject_GC_Del(it); Py_DECREF(tp); } @@ -1742,6 +1746,7 @@ future_new_iter(PyObject *fut) asyncio_state *state = get_asyncio_state_by_def((PyObject *)fut); ENSURE_FUTURE_ALIVE(state, fut) +#ifndef Py_GIL_DISABLED if (state->fi_freelist_len) { state->fi_freelist_len--; it = state->fi_freelist; @@ -1749,7 +1754,9 @@ future_new_iter(PyObject *fut) it->future = NULL; _Py_NewReference((PyObject*) it); } - else { + else +#endif + { it = PyObject_GC_New(futureiterobject, state->FutureIterType); if (it == NULL) { return NULL; @@ -3463,6 +3470,7 @@ _asyncio_current_task_impl(PyObject *module, PyObject *loop) static void module_free_freelists(asyncio_state *state) { +#ifndef Py_GIL_DISABLED PyObject *next; PyObject *current; @@ -3477,6 +3485,7 @@ module_free_freelists(asyncio_state *state) } assert(state->fi_freelist_len == 0); state->fi_freelist = NULL; +#endif } static int @@ -3507,6 +3516,7 @@ module_traverse(PyObject *mod, visitproc visit, void *arg) Py_VISIT(state->context_kwname); +#ifndef Py_GIL_DISABLED // Visit freelist. PyObject *next = (PyObject*) state->fi_freelist; while (next != NULL) { @@ -3514,6 +3524,8 @@ module_traverse(PyObject *mod, visitproc visit, void *arg) Py_VISIT(current); next = (PyObject*) ((futureiterobject*) current)->future; } +#endif + return 0; }