mirror of https://github.com/python/cpython
GH-102126: fix deadlock at shutdown when clearing thread states (#102222)
This commit is contained in:
parent
56e93c8020
commit
5f11478ce7
|
@ -0,0 +1 @@
|
|||
Fix deadlock at shutdown when clearing thread states if any finalizer tries to acquire the runtime head lock. Patch by Kumar Aditya.
|
|
@ -754,12 +754,19 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
|
|||
_PyErr_Clear(tstate);
|
||||
}
|
||||
|
||||
// Clear the current/main thread state last.
|
||||
HEAD_LOCK(runtime);
|
||||
// XXX Clear the current/main thread state last.
|
||||
for (PyThreadState *p = interp->threads.head; p != NULL; p = p->next) {
|
||||
PyThreadState_Clear(p);
|
||||
}
|
||||
PyThreadState *p = interp->threads.head;
|
||||
HEAD_UNLOCK(runtime);
|
||||
while (p != NULL) {
|
||||
// See https://github.com/python/cpython/issues/102126
|
||||
// Must be called without HEAD_LOCK held as it can deadlock
|
||||
// if any finalizer tries to acquire that lock.
|
||||
PyThreadState_Clear(p);
|
||||
HEAD_LOCK(runtime);
|
||||
p = p->next;
|
||||
HEAD_UNLOCK(runtime);
|
||||
}
|
||||
|
||||
/* It is possible that any of the objects below have a finalizer
|
||||
that runs Python code or otherwise relies on a thread state
|
||||
|
|
Loading…
Reference in New Issue