]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.13] gh-120974: Make _asyncio._enter_task atomic in the free-threaded build (GH...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Tue, 23 Jul 2024 09:17:52 +0000 (11:17 +0200)
committerGitHub <noreply@github.com>
Tue, 23 Jul 2024 09:17:52 +0000 (09:17 +0000)
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 47847aa8ef66837f984fc4e30187d88f8d8ab201)

Co-authored-by: Sam Gross <colesbury@gmail.com>
Modules/_asynciomodule.c

index 23cbd48528e0f85dceb09d6db104b79f64af0038..fffa6d25d022acf96d3154bbcc20ff083280a16c 100644 (file)
@@ -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;
 }