8000 [3.10] GH-102126: fix deadlock at shutdown when clearing thread state… by kumaraditya303 · Pull Request #102235 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.10] GH-102126: fix deadlock at shutdown when clearing thread state… #102235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 3, 2023
Merged

[3.10] GH-102126: fix deadlock at shutdown when clearing thread state… #102235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
853414b
[3.10] GH-102126: fix deadlock at shutdown when clearing thread state…
kumaraditya303 Feb 25, 2023
b63595c
Merge branch '3.10' into backport-5f11478-3.10
kumaraditya303 Feb 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[3.10] GH-102126: fix deadlock at shutdown when clearing thread states ( 
GH-102222).

(cherry picked from commit 5f11478)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
  • Loading branch information
@kumaraditya303
kumaraditya303 committed Feb 25, 2023
commit 853414bf5616ec11253cc0e45097feaf05e4979b
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-02-24-17-59-39.gh-issue-102126.HTT8Vc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
12 changes: 10 additions & 2 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,19 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
_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 *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);
}
HEAD_UNLOCK(runtime);

Py_CLEAR(interp->audit_hooks);

Expand Down
0