8000 GH-109369: Merge all eval-breaker flags and monitoring version into one word. by markshannon · Pull Request #109846 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-109369: Merge all eval-breaker flags and monitoring version into one word. #109846

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 20 commits into from
Oct 4, 2023
Merged

GH-109369: Merge all eval-breaker flags and monitoring version into one word. #109846

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
dba7b7e
Remove nonsense thread checks
markshannon Sep 13, 2023
2b8766e
Use one bit per check in eval_breaker
markshannon Sep 13, 2023
f7205ff
Add main callback enum
markshannon Sep 22, 2023
4da67aa
Put instrumentation version and eval-breaker flags into same word
markshannon Sep 25, 2023
4fa77bc
Restore name of eval_breaker
markshannon Sep 25, 2023
b8258df
Use full word for monitoring. Avoids running out of versions on 64 bi…
markshannon Sep 25, 2023
44c7900
Merge branch 'main' into tidy-up-eval-breaker
markshannon Sep 25, 2023
5589233
Remove some #includes
markshannon Sep 25, 2023
66cd1c3
Fix a couple of sizes and make read atomic
markshannon Sep 25, 2023
0b85608
Keep eval_breaker synchronized with thread state
markshannon Sep 25, 2023
558a4f9
Avoid using tstate when it might have been freed
markshannon Sep 26, 2023
36f85b7
Address review comments
markshannon Sep 26, 2023
9643290
Add news
markshannon Sep 26, 2023
b6a49f5
Convert magic numbers to named constants
markshannon Sep 26, 2023
94b0515
Make sure that async exception bit is cleared when handling pending e…
markshannon Sep 26, 2023
0bb8bd2
Relax a load and use named const
markshannon Sep 26, 2023
7c74435
Regen files
markshannon Sep 26, 2023
92cf1ff
Use named constant
markshannon Sep 28, 2023
134ae82
Merge branch 'main' into tidy-up-eval-breaker
markshannon Oct 2, 10000 2023
da0d844
Clarify distinction between main thread handling calls and main threa…
markshannon Oct 2, 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
Avoid using tstate when it might have been freed
  • Loading branch information
@markshannon
markshannon committed Sep 26, 2023
commit 558a4f985cf682733022a9de5f43832cbbe7d403
27 changes: 11 additions & 16 deletions Python/ceval_gil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,9 @@ static void recreate_gil(struct _gil_runtime_state *gil)
#endif

static void
drop_gil(struct _ceval_state *ceval, PyThreadState *tstate)
drop_gil(PyInterpreterState *interp, PyThreadState *tstate)
{
struct _ceval_state *ceval = &interp->ceval;
/* If tstate is NULL, the caller is indicating that we're releasing
the GIL for the last time in this thread. This is particularly
relevant when the current thread state is finalizing or its
Expand Down Expand Up @@ -257,7 +258,7 @@ drop_gil(struct _ceval_state *ceval, PyThreadState *tstate)
the GIL, and that's the only time we might delete the
interpreter, so checking tstate first prevents the crash.
See https://github.com/python/cpython/issues/104341. */
if (tstate != NULL && _Py_eval_breaker_bit_is_set(tstate->interp, _PY_GIL_DROP_REQUEST_BIT)) {
if (tstate != NULL && _Py_eval_breaker_bit_is_set(interp, _PY_GIL_DROP_REQUEST_BIT)) {
MUTEX_LOCK(gil->switch_mutex);
/* Not switched yet => wait */
if (((PyThreadState*)_Py_atomic_load_relaxed(&gil->last_holder)) == tstate)
Expand Down Expand Up @@ -303,8 +304,7 @@ take_gil(PyThreadState *tstate)

assert(_PyThreadState_CheckConsistency(tstate));
PyInterpreterState *interp = tstate->interp;
struct _ceval_state *ceval = &interp->ceval;
struct _gil_runtime_state *gil = ceval->gil;
struct _gil_runtime_state *gil = interp->ceval.gil;

/* Check that _PyEval_InitThreads() was called to create the lock */
assert(gil_created(gil));
Expand Down Expand Up @@ -378,7 +378,7 @@ take_gil(PyThreadState *tstate)
in take_gil() while the main thread called
wait_for_thread_shutdown() from Py_Finalize(). */
MUTEX_UNLOCK(gil->mutex);
drop_gil(ceval, tstate);
drop_gil(interp, tstate);
PyThread_exit_thread();
}
assert(_PyThreadState_CheckConsistency(tstate));
Expand Down Expand Up @@ -544,8 +544,7 @@ PyEval_ReleaseLock(void)
/* This function must succeed when the current thread state is NULL.
We therefore avoid PyThreadState_Get() which dumps a fatal error
in debug mode. */
struct _ceval_state *ceval = &tstate->interp->ceval;
drop_gil(ceval, tstate);
drop_gil(tstate->interp, tstate);
}

void
Expand All @@ -561,8 +560,7 @@ _PyEval_ReleaseLock(PyInterpreterState *interp, PyThreadState *tstate)
/* If tstate is NULL then we do not expect the current thread
to acquire the GIL ever again. */
assert(tstate == NULL || tstate->interp == interp);
struct _ceval_state *ceval = &interp->ceval;
drop_gil(ceval, tstate);
drop_gil(interp, tstate);
}

void
Expand All @@ -586,8 +584,7 @@ PyEval_ReleaseThread(PyThreadState *tstate)
if (new_tstate != tstate) {
Py_FatalError("wrong thread state");
}
struct _ceval_state *ceval = &tstate->interp->ceval;
drop_gil(ceval, tstate);
drop_gil(tstate->interp, tstate);
}

#ifdef HAVE_FORK
Expand Down Expand Up @@ -633,9 +630,8 @@ PyEval_SaveThread(void)
PyThreadState *tstate = _PyThreadState_SwapNoGIL(NULL);
_Py_EnsureTstateNotNULL(tstate);

struct _ceval_state *ceval = &tstate->interp->ceval;
assert(gil_created(ceval->gil));
drop_gil(ceval, tstate);
assert(gil_created(tstate->interp->ceval.gil));
drop_gil(tstate->interp, tstate);
return tstate;
}

Expand Down Expand Up @@ -998,7 +994,6 @@ _PyEval_FiniState(struct _ceval_state *ceval)
int
_Py_HandlePending(PyThreadState *tstate)
{
struct _ceval_state *interp_ceval_state = &tstate->interp->ceval;
PyInterpreterState *interp = tstate->interp;

/* Pending signals */
Expand Down Expand Up @@ -1027,7 +1022,7 @@ _Py_HandlePending(PyThreadState *tstate)
if (_PyThreadState_SwapNoGIL(NULL) != tstate) {
Py_FatalError("tstate mix-up");
}
drop_gil(interp_ceval_state, tstate);
drop_gil(interp, tstate);

/* Other threads may run now */

Expand Down
0