mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[3.9] GH-102126: fix deadlock at shutdown when clearing thread states (GH-102222) (#102236) 

(cherry picked from commit 5f11478ce7)
This commit is contained in:
Kumar Aditya 2023-03-28 14:25:36 +05:30 committed by GitHub
parent b5a94301a2
commit 7cb3a44747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2023-02-24-17-59-39.gh-issue-102126.HTT8Vc.rst Normal file
View File

@ -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.

14
Python/pystate.c
View File

@ -288,11 +288,19 @@ PyInterpreterState_Clear(PyInterpreterState *interp)
_PyErr_Clear(tstate);
}
// Clear the current/main thread state last.
HEAD_LOCK(runtime);
for (PyThreadState *p = interp->tstate_head; p != NULL; p = p->next) {
PyThreadState_Clear(p);
}
PyThreadState *p = interp->tstate_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);
}
Py_CLEAR(interp->audit_hooks);