Remove cr_task/gi_task

python · ambv · Jan 22, 2025 · Sep 24, 2024 · Sep 25, 2024 · Sep 26, 2024
commit 067c043cc4792fa19a04a905b16a2da3731a7ece
diff --git a/Include/cpython/genobject.h b/Include/cpython/genobject.h
@@ -32,8 +32,6 @@ PyAPI_DATA(PyTypeObject) PyCoro_Type;
 PyAPI_FUNC(PyObject *) PyCoro_New(PyFrameObject *,
     PyObject *name, PyObject *qualname);
 
-PyAPI_FUNC(void) _PyCoro_SetTask(PyObject *coro, PyObject *task);
-
 
 /* --- Asynchronous Generators -------------------------------------------- */
 

diff --git a/Include/internal/pycore_debug_offsets.h b/Include/internal/pycore_debug_offsets.h
@@ -203,7 +203,6 @@ typedef struct _Py_DebugOffsets {
         uint64_t size;
         uint64_t gi_name;
         uint64_t gi_iframe;
-        uint64_t gi_task;
         uint64_t gi_frame_state;
     } gen_object;
 } _Py_DebugOffsets;
@@ -324,7 +323,6 @@ typedef struct _Py_DebugOffsets {
         .size = sizeof(PyGenObject), \
         .gi_name = offsetof(PyGenObject, gi_name), \
         .gi_iframe = offsetof(PyGenObject, gi_iframe), \
-        .gi_task = offsetof(PyGenObject, gi_task), \
         .gi_frame_state = offsetof(PyGenObject, gi_frame_state), \
     }, \
 }

diff --git a/Include/internal/pycore_genobject.h b/Include/internal/pycore_genobject.h
@@ -22,13 +22,6 @@ extern "C" {
     PyObject *prefix##_qualname;                                            \
     _PyErr_StackItem prefix##_exc_state;                                    \
     PyObject *prefix##_origin_or_finalizer;                                 \
-    /* A *borrowed* reference to a task that drives the coroutine.          \
-       The field is meant to be used by profilers and debuggers only.       \
-       The main invariant is that a task can't get GC'ed while              \
-       the coroutine it drives is alive and vice versa.                     \
-       Profilers can use this field to reconstruct the full async           \
-       call stack of program. */                                            \
-    PyObject *prefix##_task;                                                \
     char prefix##_hooks_inited;                                             \
     char prefix##_closed;                                                   \
     char prefix##_running_async;                                            \

@@ -22,6 +22,7 @@ typedef struct _PyThreadStateImpl {
     PyThreadState base;
 
     PyObject *asyncio_running_loop; // Strong reference
+    PyObject *asyncio_running_task; // Strong reference
 
     struct _qsbr_thread_state *qsbr;  // only used by free-threaded build
     struct llist_node mem_free_queue; // delayed free queue

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -1617,7 +1617,7 @@ def bar(cls):
             check(bar, size('PP'))
         # generator
         def get_gen(): yield 1
-        check(get_gen(), size('7P4c' + INTERPRETER_FRAME + 'P'))
+        check(get_gen(), size('6P4c' + INTERPRETER_FRAME + 'P'))
         # iterator
         check(iter('abc'), size('lP'))
         # callable-iterator

@@ -75,7 +75,6 @@ typedef struct {
     PyObject *sw_arg;
 } TaskStepMethWrapper;
 
-
 #define Future_CheckExact(state, obj) Py_IS_TYPE(obj, state->FutureType)
 #define Task_CheckExact(state, obj) Py_IS_TYPE(obj, state->TaskType)
 
@@ -113,6 +112,11 @@ typedef struct _Py_AsyncioModuleDebugOffsets {
     uint64_t task_awaited_by_is_set;
     uint64_t task_coro;
   } asyncio_task_object;
+  struct _asyncio_thread_state {
+    uint64_t size;
+    uint64_t asyncio_running_loop;
+    uint64_t asyncio_running_task;
+  } asyncio_thread_state;
 } Py_AsyncioModuleDebugOffsets;
 
 GENERATE_DEBUG_SECTION(AsyncioDebug, Py_AsyncioModuleDebugOffsets AsyncioDebug)
@@ -123,6 +127,11 @@ GENERATE_DEBUG_SECTION(AsyncioDebug, Py_AsyncioModuleDebugOffsets AsyncioDebug)
            .task_is_task = offsetof(TaskObj, task_is_task),
            .task_awaited_by_is_set = offsetof(TaskObj, task_awaited_by_is_set),
            .task_coro = offsetof(TaskObj, task_coro),
+       },
+       .asyncio_thread_state = {
+           .size = sizeof(_PyThreadStateImpl),
+           .asyncio_running_loop = offsetof(_PyThreadStateImpl, asyncio_running_loop),
+           .asyncio_running_task = offsetof(_PyThreadStateImpl, asyncio_running_task),
        }};
 
 /* State of the _asyncio module */
@@ -219,7 +228,6 @@ typedef struct {
         TaskObj tail;
         TaskObj *head;
     } asyncio_tasks;
-
 } asyncio_state;
 
 static inline asyncio_state *
@@ -268,9 +276,6 @@ task_step_handle_result_impl(asyncio_state *state, TaskObj *task, PyObject *resu
 static void
 clear_task_coro(TaskObj *task)
 {
-    if (task->task_coro != NULL && PyCoro_CheckExact(task->task_coro)) {
-        _PyCoro_SetTask(task->task_coro, NULL);
-    }
     Py_CLEAR(task->task_coro);
 }
 
@@ -279,9 +284,6 @@ static void
 set_task_coro(TaskObj *task, PyObject *coro)
 {
     assert(coro != NULL);
-    if (PyCoro_CheckExact(coro)) {
-        _PyCoro_SetTask(coro, (PyObject *)task);
-    }
     Py_INCREF(coro);
     Py_XSETREF(task->task_coro, coro);
 }
@@ -2160,7 +2162,10 @@ enter_task(asyncio_state *state, PyObject *loop, PyObject *task)
         Py_DECREF(item);
         return -1;
     }
-    Py_DECREF(item);
+
+    _PyThreadStateImpl *ts = (_PyThreadStateImpl *)_PyThreadState_GET();
+    assert(ts->asyncio_running_task == NULL);
+    ts->asyncio_running_task = item;  // strong ref
     return 0;
 }
 
@@ -2185,14 +2190,16 @@ leave_task_predicate(PyObject *item, void *task)
 
 static int
 leave_task(asyncio_state *state, PyObject *loop, PyObject *task)
-/*[clinic end generated code: output=0ebf6db4b858fb41 input=51296a46313d1ad8]*/
 {
     int res = _PyDict_DelItemIf(state->current_tasks, loop,
                                 leave_task_predicate, task);
     if (res == 0) {
         // task was not found
         return err_leave_task(Py_None, task);
     }
+
+    _PyThreadStateImpl *ts = (_PyThreadStateImpl *)_PyThreadState_GET();
+    Py_CLEAR(ts->asyncio_running_task);
     return res;
 }
 
@@ -3960,7 +3967,9 @@ module_clear(PyObject *mod)
     Py_CLEAR(state->iscoroutine_typecache);
 
     Py_CLEAR(state->context_kwname);
-
+    _PyThreadStateImpl *ts = (_PyThreadStateImpl *)_PyThreadState_GET();
+    Py_CLEAR(ts->asyncio_running_loop);
+    Py_CLEAR(ts->asyncio_running_task);
     return 0;
 }
 
@@ -3990,7 +3999,6 @@ module_init(asyncio_state *state)
         goto fail;
     }
 
-
     state->context_kwname = Py_BuildValue("(s)", "context");
     if (state->context_kwname == NULL) {
         goto fail;