Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

gh-104341: Call _PyEval_ReleaseLock() with NULL When Finalizing the Current Thread #105109

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 7 commits into from
Jun 1, 2023
Merged

gh-104341: Call _PyEval_ReleaseLock() with NULL When Finalizing the Current Thread #105109

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5206f3d
Call _PyEval_ReleaseLock() with NULL when finalizing the current thread.
ericsnowcurrently May 30, 2023
db6d7ac
Temporarily adjust tstate->_status.cleared during interpreter_clear().
ericsnowcurrently May 30, 2023
a374f48
Disable the broken asserts.
ericsnowcurrently May 30, 2023
432db0c
Add a note about the race in drop_gil().
ericsnowcurrently May 31, 2023
1280e0d
Fix a typo.
ericsnowcurrently May 31, 2023
cc1f2fe
Clarify a comment.
ericsnowcurrently May 31, 2023
b64b299
minor comment typo fix.
gpshead Jun 1, 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
Prev Previous commit
Next Next commit
Temporarily adjust tstate->_status.cleared during interpreter_clear().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed May 30, 2023
commit db6d7ac54435dae0b56bbdefcc8f81a9ebd028dc
12 changes: 12 additions & 0 deletions 12 Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,12 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
p = p->next;
HEAD_UNLOCK(runtime);
}
if (tstate->interp == interp) {
/* We fix tstate->_status below we we for sure aren't using it
gpshead marked this conversation as resolved.
Show resolved Hide resolved
(e.g. no longer need the GIL). */
// XXX Eliminate the need to do this.
tstate->_status.cleared = 0;
}

/* It is possible that any of the objects below have a finalizer
that runs Python code or otherwise relies on a thread state
Expand Down Expand Up @@ -886,6 +892,12 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
Py_CLEAR(interp->builtins);
Py_CLEAR(interp->interpreter_trampoline);

if (tstate->interp == interp) {
/* We are now safe to fix tstate->_status.cleared. */
// XXX Do this (much) earlier?
tstate->_status.cleared = 1;
}

for (int i=0; i < DICT_MAX_WATCHERS; i++) {
interp->dict_state.watchers[i] = NULL;
}
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.