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

Show file tree
Hide file tree
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, 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
Convert magic numbers to named constants
  • Loading branch information
@markshannon
markshannon committed Sep 26, 2023
commit b6a49f501160db316166d7f5da95aa4cad415173
3 changes: 3 additions & 0 deletions Include/internal/pycore_ceval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ void _PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame)
#define _PY_ASYNC_EXCEPTION_BIT 3
#define _PY_GC_SCHEDULED_BIT 4

/* Reserve a few bits for future use */
#define _PY_EVAL_EVENTS_BITS 8
#define _PY_EVAL_EVENTS_MASK ((1 << _PY_EVAL_EVENTS_BITS)-1)

static inline void
_Py_set_eval_breaker_bit(PyInterpreterState *interp, uint32_t bit, uint32_t set)
Expand Down
4 changes: 2 additions & 2 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ dummy_func(
#endif
uintptr_t eval_breaker = _Py_atomic_load_uintptr_relaxed(&tstate->interp->ceval.eval_breaker);
uintptr_t version = _PyFrame_GetCode(frame)->_co_instrumentation_version;
assert((version & 255) == 0);
assert((version & _PY_EVAL_EVENTS_MASK) == 0);
DEOPT_IF(eval_breaker != version, RESUME);
}

inst(INSTRUMENTED_RESUME, (--)) {
uintptr_t global_version = _Py_atomic_load_uintptr_relaxed(&tstate->interp->ceval.eval_breaker) & ~0xff;
uintptr_t global_version = _Py_atomic_load_uintptr_relaxed(&tstate->interp->ceval.eval_breaker) & ~_PY_EVAL_EVENTS_MASK;
uintptr_t code_version = _PyFrame_GetCode(frame)->_co_instrumentation_version;
if (code_version != global_version) {
if (_Py_Instrument(_PyFrame_GetCode(frame), tstate->interp)) {
Expand Down
2 changes: 1 addition & 1 deletion Python/ceval_macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@

#define CHECK_EVAL_BREAKER() \
_Py_CHECK_EMSCRIPTEN_SIGNALS_PERIODICALLY(); \
if (_Py_atomic_load_uintptr_relaxed(&tstate->interp->ceval.eval_breaker) & 255) { \
if (_Py_atomic_load_uintptr_relaxed(&tstate->interp->ceval.eval_breaker) & _PY_EVAL_EVENTS_MASK) { \
if (_Py_HandlePending(tstate) != 0) { \
goto error; \
} \
Expand Down
3 changes: 2 additions & 1 deletion Python/instrumentation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "pycore_bitutils.h" // _Py_popcount32
#include "pycore_call.h"
#include "pycore_ceval.h" // _PY_EVAL_EVENTS_BITS
#include "pycore_code.h" // _PyCode_Clear_Executors()
#include "pycore_frame.h"
#include "pycore_interp.h"
Expand Down Expand Up @@ -1780,7 +1781,7 @@ check_tool(PyInterpreterState *interp, int tool_id)

/* We share the eval-breaker with flags, so the monitoring
* version goes in the top 24 bits */
#define MONITORING_VERSION_INCREMENT (1 << 8)
#define MONITORING_VERSION_INCREMENT (1 << _PY_EVAL_EVENTS_BITS)

int
_PyMonitoring_SetEvents(int tool_id, _PyMonitoringEventSet events)
Expand Down
0