Skip to content

gh-112175: Add eval_breaker to PyThreadState #115194

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 13 commits into from
Feb 20, 2024
Merged

gh-112175: Add eval_breaker to PyThreadState #115194

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bc613e4
gh-112175: Add `eval_breaker` to `PyThreadState`
swtaarrs Jan 18, 2024
76fed4e
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 9, 2024
321c153
Remove unnecessary test
swtaarrs Feb 9, 2024
f78c505
Review comments from Sam
swtaarrs Feb 9, 2024
58f679c
Add !IsSignalled check to free-threaded _Py_ScheduleGC to match norma…
swtaarrs Feb 9, 2024
cf2a8a4
Move breaker bits/functions back to pycore_ceval.h, restore old namin…
swtaarrs Feb 9, 2024
470727e
Merge remote-tracking branch 'upstream/main' into cpython-eval-breaker.
swtaarrs Feb 9, 2024
f129fd6
Back to signed 1 in _PY_EVAL_EVENTS_MASK
swtaarrs Feb 12, 2024
4260410
Don't copy _PY_GC_SCHEDULED_BIT to/from interp_eval_breaker
swtaarrs Feb 13, 2024
0db460e
Merge remote-tracking branch 'upstream/main' into cpython-eval-breaker
swtaarrs Feb 13, 2024
0e1055f
Remove unnecessary NULL check, add uint32_t cast
swtaarrs Feb 15, 2024
2139ed4
Merge remote-tracking branch 'upstream/main' into cpython-eval-breaker
swtaarrs Feb 15, 2024
90450ce
Merge remote-tracking branch 'upstream/main' into cpython-eval-breaker
swtaarrs Feb 20, 2024
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
Remove unnecessary NULL check, add uint32_t cast
  • Loading branch information
@swtaarrs
swtaarrs committed Feb 15, 2024
commit 0e1055fc195165662acbc9a4f165aadb72f150fb
4 changes: 0 additions & 4 deletions Python/ceval_gil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ update_eval_breaker_for_thread(PyInterpreterState *interp, PyThreadState *tstate
return;
#endif

if (tstate == NULL) {
return;
}

int32_t calls_to_do = _Py_atomic_load_int32_relaxed(
&interp->ceval.pending.calls_to_do);
if (calls_to_do) {
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 @@ -891,7 +891,8 @@ static inline int most_significant_bit(uint8_t bits) {
static uint32_t
global_version(PyInterpreterState *interp)
{
return _Py_atomic_load_uintptr_relaxed(&interp->ceval.instrumentation_version);
return (uint32_t)_Py_atomic_load_uintptr_relaxed(
&interp->ceval.instrumentation_version);
}

/* Atomically set the given version in the given location, without touching
Expand Down