8000 gh-128002: use efficient linked list impl for eager tasks in asyncio by kumaraditya303 · Pull Request #130518 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-128002: use efficient linked list impl for eager tasks in asyncio #130518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 3, 2025
Merged

gh-128002: use efficient linked list impl for eager tasks in asyncio #130518

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d51879
work
kumaraditya303 Feb 23, 2025
c2fc5bd
add comments
kumaraditya303 Feb 24, 2025
e36c0c5
Update Modules/_asynciomodule.c
kumaraditya303 Mar 3, 2025
5dd55a0
Update Modules/_asynciomodule.c
kumaraditya303 Mar 3, 2025
c9f409f
Merge branch 'main' into eager
kumaraditya303 Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
work
  • Loading branch information
@kumaraditya303
kumaraditya303 committed Feb 24, 2025
commit 0d518792d0b990daf40b0f2fbd3b292b8fd6df3e
1 change: 0 additions & 1 deletion Lib/asyncio/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,6 @@ def _unregister_eager_task(task):
from _asyncio import (_register_task, _register_eager_task,
_unregister_task, _unregister_eager_task,
_enter_task, _leave_task, _swap_current_task,
_scheduled_tasks, _eager_tasks,
current_task, all_tasks)
except ImportError:
pass
Expand Down
69 changes: 29 additions & 40 deletions Modules/_asynciomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,9 @@ typedef struct {
inherit from native asyncio.Task */
PyObject *non_asyncio_tasks;

/* Set containing all eagerly executing tasks. */
PyObject *eager_tasks;
/* Set containing all 3rd party eagerly executing tasks which don't
inherit from native asyncio.Task */
PyObject *non_asyncio_eager_tasks;

/* An isinstance type cache for the 'is_coroutine()' function. */
PyObject *iscoroutine_typecache;
Expand Down Expand Up @@ -2180,12 +2181,6 @@ register_task(TaskObj *task)
llist_insert_tail(head, &task->task_node);
}

static int
register_eager_task(asyncio_state *state, PyObject *task)
{
return PySet_Add(state->eager_tasks, task);
}

static inline void
unregister_task_safe(TaskObj *task)
{
Expand Down Expand Up @@ -2219,12 +2214,6 @@ unregister_task(TaskObj *task)
#endif
}

static int
unregister_eager_task(asyncio_state *state, PyObject *task)
{
return PySet_Discard(state->eager_tasks, task);
}

static int
enter_task(PyObject *loop, PyObject *task)
{
Expand Down Expand Up @@ -3473,10 +3462,7 @@ task_eager_start(asyncio_state *state, TaskObj *task)
return -1;
}

if (register_eager_task(state, (PyObject *)task) == -1) {
Py_DECREF(prevtask);
return -1;
}
register_task(task);

if (PyContext_Enter(task->task_context) == -1) {
Py_DECREF(prevtask);
Expand Down Expand Up @@ -3506,17 +3492,11 @@ task_eager_start(asyncio_state *state, TaskObj *task)
Py_DECREF(curtask);
}

if (unregister_eager_task(state, (PyObject *)task) == -1) {
retval = -1;
}

if (PyContext_Exit(task->task_context) == -1) {
retval = -1;
}

if (task->task_state == STATE_PENDING) {
register_task(task);
} else {
if (task->task_state != STATE_PENDING) {
// This seems to really help performance on pyperformance benchmarks
clear_task_coro(task);
}
Expand Down Expand Up @@ -3735,9 +3715,18 @@ _asyncio__register_eager_task_impl(PyObject *module, PyObject *task)
/*[clinic end generated code: output=dfe1d45367c73f1a input=237f684683398c51]*/
{
asyncio_state *state = get_asyncio_state(module);
if (register_eager_task(state, task) < 0) {

if (Task_Check(state, task)) {
// task is an asyncio.Task instance or subclass, use efficient
// linked-list implementation.
register_task((TaskObj *)task);
Py_RETURN_NONE;
}

if (PySet_Add(state->non_asyncio_eager_tasks, task) < 0) {
return NULL;
}

Py_RETURN_NONE;
}

Expand Down Expand Up @@ -3785,9 +3774,17 @@ _asyncio__unregister_eager_task_impl(PyObject *module, PyObject *task)
/*[clinic end generated code: output=a426922bd07f23d1 input=9d07401ef14ee048]*/
{
asyncio_state *state = get_asyncio_state(module);
if (unregister_eager_task(state, task) < 0) {
if (Task_Check(state, task)) {
// task is an asyncio.Task instance or subclass, use efficient
// linked-list implementation.
unregister_task((TaskObj *)task);
Py_RETURN_NONE;
}

if (PySet_Discard(state->non_asyncio_eager_tasks, task) < 0) {
return NULL;
}

Py_RETURN_NONE;
}

Expand Down Expand Up @@ -4041,7 +4038,7 @@ _asyncio_all_tasks_impl(PyObject *module, PyObject *loop)
Py_DECREF(loop);
return NULL;
}
if (PyList_Extend(tasks, state->eager_tasks) < 0) {
if (PyList_Extend(tasks, state->non_asyncio_eager_tasks) < 0) {
Py_DECREF(tasks);
Py_DECREF(loop);
return NULL;
Expand Down Expand Up @@ -4179,7 +4176,7 @@ module_traverse(PyObject *mod, visitproc visit, void *arg)
Py_VISIT(state->asyncio_CancelledError);

Py_VISIT(state->non_asyncio_tasks);
Py_VISIT(state->eager_tasks);
Py_VISIT(state->non_asyncio_eager_tasks);
Py_VISIT(state->iscoroutine_typecache);

Py_VISIT(state->context_kwname);
Expand Down Expand Up @@ -4209,7 +4206,7 @@ module_clear(PyObject *mod)
Py_CLEAR(state->asyncio_CancelledError);

Py_CLEAR(state->non_asyncio_tasks);
Py_CLEAR(state->eager_tasks);
Py_CLEAR(state->non_asyncio_eager_tasks);
Py_CLEAR(state->iscoroutine_typecache);

Py_CLEAR(state->context_kwname);
Expand Down Expand Up @@ -4292,8 +4289,8 @@ module_init(asyncio_state *state)
goto fail;
}

state->eager_tasks = PySet_New(NULL);
if (state->eager_tasks == NULL) {
state->non_asyncio_eager_tasks = PySet_New(NULL);
if (state->non_asyncio_eager_tasks == NULL) {
goto fail;
}

Expand Down Expand Up @@ -4363,14 +4360,6 @@ module_exec(PyObject *mod)
return -1;
}

if (PyModule_AddObjectRef(mod, "_scheduled_tasks", state->non_asyncio_tasks) < 0) {
return -1;
}

if (PyModule_AddObjectRef(mod, "_eager_tasks", state->eager_tasks) < 0) {
return -1;
}

return 0;
}

Expand Down
0