mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

GH-90081: Run python tracers at full speed (GH-95328) (#95363)

Browse source 
(cherry picked from commit b8b2990fb3)

Co-authored-by: Mark Shannon <mark@hotpy.org>

Co-authored-by: Mark Shannon <mark@hotpy.org>
This commit is contained in:
Miss Islington (bot) 2022-07-29 01:43:52 -07:00 • committed by GitHub
parent f06f3656c5
commit 00566a8124
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Include/internal/pycore_pystate.h
View file

@ -131,8 +131,9 @@ PyAPI_FUNC(void) _PyThreadState_DeleteExcept(
static inline void static inline void
_PyThreadState_UpdateTracingState(PyThreadState *tstate) _PyThreadState_UpdateTracingState(PyThreadState *tstate)
{ {
int use_tracing = (tstate->c_tracefunc != NULL bool use_tracing =
|| tstate->c_profilefunc != NULL); (tstate->tracing == 0) &&
(tstate->c_tracefunc != NULL || tstate->c_profilefunc != NULL);
tstate->cframe->use_tracing = (use_tracing ? 255 : 0); tstate->cframe->use_tracing = (use_tracing ? 255 : 0);
} }

2
Misc/NEWS.d/next/Core and Builtins/2022-07-27-14-21-57.gh-issue-90081.HVAS5x.rst Normal file
View file

@ -0,0 +1,2 @@
Run Python code in tracer/profiler function at full speed. Fixes slowdown in
earlier versions of 3.11.

9
Python/ceval.c
View file

@ -5620,9 +5620,9 @@ handle_eval_breaker:
case DO_TRACING: case DO_TRACING:
#endif #endif
{ {
if (tstate->tracing == 0 && assert(cframe.use_tracing);
INSTR_OFFSET() >= frame->f_code->_co_firsttraceable assert(tstate->tracing == 0);
) { if (INSTR_OFFSET() >= frame->f_code->_co_firsttraceable) {
int instr_prev = _PyInterpreterFrame_LASTI(frame); int instr_prev = _PyInterpreterFrame_LASTI(frame);
frame->prev_instr = next_instr; frame->prev_instr = next_instr;
TRACING_NEXTOPARG(); TRACING_NEXTOPARG();
@ -6832,12 +6832,15 @@ void
PyThreadState_EnterTracing(PyThreadState *tstate) PyThreadState_EnterTracing(PyThreadState *tstate)
{ {
tstate->tracing++; tstate->tracing++;
tstate->cframe->use_tracing = 0;
} }
void void
PyThreadState_LeaveTracing(PyThreadState *tstate) PyThreadState_LeaveTracing(PyThreadState *tstate)
{ {
assert(tstate->tracing > 0 && tstate->cframe->use_tracing == 0);
tstate->tracing--; tstate->tracing--;
_PyThreadState_UpdateTracingState(tstate);
} }
static int static int