a1batross
/
kore
forked from mirrors/kore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clear lockop before removing a reference from the coroutine.

This commit is contained in:
Joris Vink 2020-08-10 12:19:42 +02:00
parent 08d66e3926
commit 68d078766e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/python.c
View File

@ -417,8 +417,6 @@ kore_python_coro_delete(void *obj)
python_coro_trace(coro->killed ? "killed" : "deleted", coro);
coro_running = coro;
Py_DECREF(coro->obj);
coro_running = NULL;
if (coro->lockop != NULL) {
coro->lockop->active = 0;
@ -427,6 +425,9 @@ kore_python_coro_delete(void *obj)
coro->lockop = NULL;
}
Py_DECREF(coro->obj);
coro_running = NULL;
if (coro->state == CORO_STATE_RUNNABLE)
TAILQ_REMOVE(&coro_runnable, coro, list);
else
@ -1809,6 +1810,12 @@ python_kore_task_kill(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "I", &id))
return (NULL);
if (coro_running->id == id) {
PyErr_SetString(PyExc_RuntimeError,
"refusing to kill active coroutine");
return (NULL);
}
/* Remember active coro, as delete sets coro_running to NULL. */
active = coro_running;
@ -3762,6 +3769,7 @@ pylock_op_iternext(struct pylock_op *op)
*/
if (op->active == 0) {
op->active = 1;
op->coro->lockop = op;
TAILQ_INSERT_HEAD(&op->lock->ops, op, list);
Py_INCREF((PyObject *)op);
}