Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 0 additions & 1 deletion Lib/asyncio/tasks.py
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
74 changes: 33 additions & 41 deletions Modules/_asynciomodule.c
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 @@ -3472,11 +3461,11 @@ task_eager_start(asyncio_state *state, TaskObj *task)
if (prevtask == NULL) {
return -1;
}

if (register_eager_task(state, (PyObject *)task) == -1) {
Py_DECREF(prevtask);
return -1;
}
// register the task into the linked list of tasks
// if the task completely eagerly then it will unregister itself
// in future_schedule_callbacks when done otherwise
// it will continue in lazy execution
register_task(task);

if (PyContext_Enter(task->task_context) == -1) {
Py_DECREF(prevtask);
Expand Down Expand Up @@ -3506,17 +3495,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 +3718,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 +3777,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 +4041,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 +4179,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 +4209,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 +4292,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 +4363,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
Loading