Skip to content

gh-116738: make entering of contextvars.Context thread safe #143074

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
kumaraditya303 merged 4 commits into from
Jan 6, 2026
Merged

gh-116738: make entering of contextvars.Context thread safe #143074

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68f8ec6
make entering of context thread safe
kumaraditya303 Dec 21, 2025
7fb7931
📜🤖 Added by blurb_it.
blurb-it[bot] Dec 22, 2025
cc959da
code review: make exiting thread safe
kumaraditya303 Dec 22, 2025
6a3e53c
Merge branch 'context' of https://github.com/kumaraditya303/cpython i…
kumaraditya303 Dec 22, 2025
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
code review: make exiting thread safe
  • Loading branch information
@kumaraditya303
kumaraditya303 committed Dec 22, 2025
commit cc959daa04337b5433c22563d8bb95aa6023c17d
8 changes: 2 additions & 6 deletions Python/context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,7 @@ _PyContext_Exit(PyThreadState *ts, PyObject *octx)
{
ENSURE_Context(octx, -1)
PyContext *ctx = (PyContext *)octx;
#ifdef Py_GIL_DISABLED
int already_entered = _Py_atomic_exchange_int(&ctx->ctx_entered, 0);
#else
int already_entered = ctx->ctx_entered;
ctx->ctx_entered = 0;
#endif
int already_entered = FT_ATOMIC_LOAD_INT_RELAXED(ctx->ctx_entered);

if (!already_entered) {
PyErr_Format(PyExc_RuntimeError,
Expand All @@ -253,6 +248,7 @@ _PyContext_Exit(PyThreadState *ts, PyObject *octx)
Py_SETREF(ts->context, (PyObject *)ctx->ctx_prev);

ctx->ctx_prev = NULL;
FT_ATOMIC_STORE_INT(ctx->ctx_entered, 0);
context_switched(ts);
return 0;
}
Expand Down