mirror of https://github.com/python/cpython
[3.13] gh-120974: Make _asyncio._enter_task atomic in the free-threaded build (GH-122138) (#122152)
gh-120974: Make _asyncio._enter_task atomic in the free-threaded build (GH-122138)
Use `PyDict_SetDefaultRef` to set the current task in a single operation
under the dictionary's lock.
(cherry picked from commit 47847aa8ef
)
Co-authored-by: Sam Gross <colesbury@gmail.com>
This commit is contained in:
parent
4892cc072a
commit
48154e7053
|
@ -1928,14 +1928,11 @@ static int
|
|||
enter_task(asyncio_state *state, PyObject *loop, PyObject *task)
|
||||
{
|
||||
PyObject *item;
|
||||
Py_hash_t hash;
|
||||
hash = PyObject_Hash(loop);
|
||||
if (hash == -1) {
|
||||
int res = PyDict_SetDefaultRef(state->current_tasks, loop, task, &item);
|
||||
if (res < 0) {
|
||||
return -1;
|
||||
}
|
||||
item = _PyDict_GetItem_KnownHash(state->current_tasks, loop, hash);
|
||||
if (item != NULL) {
|
||||
Py_INCREF(item);
|
||||
else if (res == 1) {
|
||||
PyErr_Format(
|
||||
PyExc_RuntimeError,
|
||||
"Cannot enter into task %R while another " \
|
||||
|
@ -1944,10 +1941,8 @@ enter_task(asyncio_state *state, PyObject *loop, PyObject *task)
|
|||
Py_DECREF(item);
|
||||
return -1;
|
||||
}
|
||||
if (PyErr_Occurred()) {
|
||||
return -1;
|
||||
}
|
||||
return _PyDict_SetItem_KnownHash(state->current_tasks, loop, task, hash);
|
||||
Py_DECREF(item);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue