Thanks to visit codestin.com
Credit goes to github.com

Skip to content

bpo-45923: Decouple suspension of tracing from tracing flag. #31908

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 2 commits into from
Mar 15, 2022
+29 −39
Merged

bpo-45923: Decouple suspension of tracing from tracing flag. #31908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a93d4a
Decouple suspension of tracing from tracing flag.
markshannon Mar 8, 2022
74f7369
Use better name.
markshannon Mar 15, 2022
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
7 changes: 1 addition & 6 deletions Include/internal/pycore_pystate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,9 @@ PyAPI_FUNC(void) _PyThreadState_DeleteExcept(
_PyRuntimeState *runtime,
PyThreadState *tstate);

static inline void
_PyThreadState_PauseTracing(PyThreadState *tstate)
{
tstate->cframe->use_tracing = 0;
}

static inline void
_PyThreadState_ResumeTracing(PyThreadState *tstate)
_PyThreadState_UpdateTracingState(PyThreadState *tstate)
{
int use_tracing = (tstate->c_tracefunc != NULL
|| tstate->c_profilefunc != NULL);
Expand Down
44 changes: 28 additions & 16 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5439,10 +5439,12 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
}

#if USE_COMPUTED_GOTOS
TARGET_DO_TRACING: {
TARGET_DO_TRACING:
#else
case DO_TRACING: {
case DO_TRACING:
#endif
{
if (tstate->tracing == 0) {
int instr_prev = skip_backwards_over_extended_args(frame->f_code, frame->f_lasti);
frame->f_lasti = INSTR_OFFSET();
TRACING_NEXTOPARG();
Expand Down Expand Up @@ -5482,11 +5484,11 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
frame->stacktop = -1;
}
}
TRACING_NEXTOPARG();
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
}

TRACING_NEXTOPARG();
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
}

#if USE_COMPUTED_GOTOS
_unknown_opcode:
Expand Down Expand Up @@ -6673,27 +6675,38 @@ initialize_trace_info(PyTraceInfo *trace_info, _PyInterpreterFrame *frame)
}
}

void
PyThreadState_EnterTracing(PyThreadState *tstate)
{
tstate->tracing++;
}

void
PyThreadState_LeaveTracing(PyThreadState *tstate)
{
tstate->tracing--;
}

static int
call_trace(Py_tracefunc func, PyObject *obj,
PyThreadState *tstate, _PyInterpreterFrame *frame,
int what, PyObject *arg)
{
int result;
if (tstate->tracing)
if (tstate->tracing) {
return 0;
tstate->tracing++;
_PyThreadState_PauseTracing(tstate);
}
PyFrameObject *f = _PyFrame_GetFrameObject(frame);
if (f == NULL) {
return -1;
}
PyThreadState_EnterTracing(tstate);
assert (frame->f_lasti >= 0);
initialize_trace_info(&tstate->trace_info, frame);
f->f_lineno = _PyCode_CheckLineNumber(frame->f_lasti*sizeof(_Py_CODEUNIT), &tstate->trace_info.bounds);
result = func(obj, f, what, arg);
f->f_lineno = 0;
_PyThreadState_ResumeTracing(tstate);
tstate->tracing--;
PyThreadState_LeaveTracing(tstate);
return result;
}

Expand All @@ -6706,7 +6719,6 @@ _PyEval_CallTracing(PyObject *func, PyObject *args)
PyObject *result;

tstate->tracing = 0;
_PyThreadState_ResumeTracing(tstate);
result = PyObject_Call(func, args, NULL);
tstate->tracing = save_tracing;
tstate->cframe->use_tracing = save_use_tracing;
Expand Down Expand Up @@ -6773,15 +6785,15 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
tstate->c_profilefunc = NULL;
tstate->c_profileobj = NULL;
/* Must make sure that tracing is not ignored if 'profileobj' is freed */
_PyThreadState_ResumeTracing(tstate);
_PyThreadState_UpdateTracingState(tstate);
Py_XDECREF(profileobj);

Py_XINCREF(arg);
tstate->c_profileobj = arg;
tstate->c_profilefunc = func;

/* Flag that tracing or profiling is turned on */
_PyThreadState_ResumeTracing(tstate);
_PyThreadState_UpdateTracingState(tstate);
return 0;
}

Expand Down Expand Up @@ -6814,15 +6826,15 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
tstate->c_tracefunc = NULL;
tstate->c_traceobj = NULL;
/* Must make sure that profiling is not ignored if 'traceobj' is freed */
_PyThreadState_ResumeTracing(tstate);
_PyThreadState_UpdateTracingState(tstate);
Py_XDECREF(traceobj);

Py_XINCREF(arg);
tstate->c_traceobj = arg;
tstate->c_tracefunc = func;

/* Flag that tracing or profiling is turned on */
_PyThreadState_ResumeTracing(tstate);
_PyThreadState_UpdateTracingState(tstate);

return 0;
}
Expand Down
17 changes: 0 additions & 17 deletions Python/pystate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,23 +1333,6 @@ PyThreadState_SetAsyncExc(unsigned long id, PyObject *exc)
return 0;
}


void
PyThreadState_EnterTracing(PyThreadState *tstate)
{
tstate->tracing++;
_PyThreadState_PauseTracing(tstate);
}

void
PyThreadState_LeaveTracing(PyThreadState *tstate)
{
tstate->tracing--;
_PyThreadState_ResumeTracing(tstate);
}



/* Routines for advanced debuggers, requested by David Beazley.
Don't use unless you know what you are doing! */

Expand Down