diff options
| -rw-r--r-- | Include/internal/pycore_pystate.h | 4 | ||||
| -rw-r--r-- | Python/ceval.c | 14 | ||||
| -rw-r--r-- | Python/pystate.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Include/internal/pycore_pystate.h b/Include/internal/pycore_pystate.h index d63239736c..9a570b08bc 100644 --- a/Include/internal/pycore_pystate.h +++ b/Include/internal/pycore_pystate.h @@ -134,13 +134,13 @@ PyAPI_FUNC(void) _PyThreadState_DeleteExcept( PyThreadState *tstate); static inline void -_PyThreadState_DisableTracing(PyThreadState *tstate) +_PyThreadState_PauseTracing(PyThreadState *tstate) { tstate->cframe->use_tracing = 0; } static inline void -_PyThreadState_ResetTracing(PyThreadState *tstate) +_PyThreadState_ResumeTracing(PyThreadState *tstate) { int use_tracing = (tstate->c_tracefunc != NULL || tstate->c_profilefunc != NULL); diff --git a/Python/ceval.c b/Python/ceval.c index 60fdf01627..05bdcc5f7f 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -6165,7 +6165,7 @@ call_trace(Py_tracefunc func, PyObject *obj, if (tstate->tracing) return 0; tstate->tracing++; - _PyThreadState_DisableTracing(tstate); + _PyThreadState_PauseTracing(tstate); PyFrameObject *f = _PyFrame_GetFrameObject(frame); if (f == NULL) { return -1; @@ -6179,7 +6179,7 @@ call_trace(Py_tracefunc func, PyObject *obj, } result = func(obj, f, what, arg); f->f_lineno = 0; - _PyThreadState_ResetTracing(tstate); + _PyThreadState_ResumeTracing(tstate); tstate->tracing--; return result; } @@ -6193,7 +6193,7 @@ _PyEval_CallTracing(PyObject *func, PyObject *args) PyObject *result; tstate->tracing = 0; - _PyThreadState_ResetTracing(tstate); + _PyThreadState_ResumeTracing(tstate); result = PyObject_Call(func, args, NULL); tstate->tracing = save_tracing; tstate->cframe->use_tracing = save_use_tracing; @@ -6250,7 +6250,7 @@ _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_ResetTracing(tstate); + _PyThreadState_ResumeTracing(tstate); Py_XDECREF(profileobj); Py_XINCREF(arg); @@ -6258,7 +6258,7 @@ _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg) tstate->c_profilefunc = func; /* Flag that tracing or profiling is turned on */ - _PyThreadState_ResetTracing(tstate); + _PyThreadState_ResumeTracing(tstate); return 0; } @@ -6291,7 +6291,7 @@ _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_ResetTracing(tstate); + _PyThreadState_ResumeTracing(tstate); Py_XDECREF(traceobj); Py_XINCREF(arg); @@ -6299,7 +6299,7 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg) tstate->c_tracefunc = func; /* Flag that tracing or profiling is turned on */ - _PyThreadState_ResetTracing(tstate); + _PyThreadState_ResumeTracing(tstate); return 0; } diff --git a/Python/pystate.c b/Python/pystate.c index abd711ee2e..7804e17a06 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -1205,14 +1205,14 @@ void PyThreadState_EnterTracing(PyThreadState *tstate) { tstate->tracing++; - _PyThreadState_DisableTracing(tstate); + _PyThreadState_PauseTracing(tstate); } void PyThreadState_LeaveTracing(PyThreadState *tstate) { tstate->tracing--; - _PyThreadState_ResetTracing(tstate); + _PyThreadState_ResumeTracing(tstate); } |