mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

clean-up tracing of C functions. In particular, don't call the trace func

Browse source 
with an exception currently set!
This commit is contained in:
Armin Rigo 2005-09-20 18:34:01 +00:00
parent 71d7e704b8
commit 1c2d7e5363
1 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Python/ceval.c
View file

@ -102,7 +102,7 @@ static int prtrace(PyObject *, char *);
static int call_trace(Py_tracefunc, PyObject *, PyFrameObject *, static int call_trace(Py_tracefunc, PyObject *, PyFrameObject *,
int, PyObject *); int, PyObject *);
static void call_trace_protected(Py_tracefunc, PyObject *, static void call_trace_protected(Py_tracefunc, PyObject *,
PyFrameObject *, int); PyFrameObject *, int, PyObject *);
static void call_exc_trace(Py_tracefunc, PyObject *, PyFrameObject *); static void call_exc_trace(Py_tracefunc, PyObject *, PyFrameObject *);
static int maybe_call_line_trace(Py_tracefunc, PyObject *, static int maybe_call_line_trace(Py_tracefunc, PyObject *,
PyFrameObject *, int *, int *, int *); PyFrameObject *, int *, int *, int *);
@ -2493,14 +2493,14 @@ fast_yield:
else if (why == WHY_EXCEPTION) { else if (why == WHY_EXCEPTION) {
call_trace_protected(tstate->c_tracefunc, call_trace_protected(tstate->c_tracefunc,
tstate->c_traceobj, f, tstate->c_traceobj, f,
PyTrace_RETURN); PyTrace_RETURN, NULL);
} }
} }
if (tstate->c_profilefunc) { if (tstate->c_profilefunc) {
if (why == WHY_EXCEPTION) if (why == WHY_EXCEPTION)
call_trace_protected(tstate->c_profilefunc, call_trace_protected(tstate->c_profilefunc,
tstate->c_profileobj, f, tstate->c_profileobj, f,
PyTrace_RETURN); PyTrace_RETURN, NULL);
else if (call_trace(tstate->c_profilefunc, else if (call_trace(tstate->c_profilefunc,
tstate->c_profileobj, f, tstate->c_profileobj, f,
PyTrace_RETURN, retval)) { PyTrace_RETURN, retval)) {
@ -3108,12 +3108,12 @@ call_exc_trace(Py_tracefunc func, PyObject *self, PyFrameObject *f)
static void static void
call_trace_protected(Py_tracefunc func, PyObject *obj, PyFrameObject *frame, call_trace_protected(Py_tracefunc func, PyObject *obj, PyFrameObject *frame,
int what) int what, PyObject *arg)
{ {
PyObject *type, *value, *traceback; PyObject *type, *value, *traceback;
int err; int err;
PyErr_Fetch(&type, &value, &traceback); PyErr_Fetch(&type, &value, &traceback);
err = call_trace(func, obj, frame, what, NULL); err = call_trace(func, obj, frame, what, arg);
if (err == 0) if (err == 0)
PyErr_Restore(type, value, traceback); PyErr_Restore(type, value, traceback);
else { else {
@ -3503,31 +3503,36 @@ err_args(PyObject *func, int flags, int nargs)
nargs); nargs);
} }
#define C_TRACE(call) \ #define C_TRACE(x, call) \
if (tstate->use_tracing && tstate->c_profilefunc) { \ if (tstate->use_tracing && tstate->c_profilefunc) { \
if (call_trace(tstate->c_profilefunc, \ if (call_trace(tstate->c_profilefunc, \
tstate->c_profileobj, \ tstate->c_profileobj, \
tstate->frame, PyTrace_C_CALL, \ tstate->frame, PyTrace_C_CALL, \
func)) \ func)) { \
{ return NULL; } \ x = NULL; \
call; \ } \
if (tstate->c_profilefunc != NULL) { \ else { \
if (x == NULL) { \ x = call; \
if (call_trace (tstate->c_profilefunc, \ if (tstate->c_profilefunc != NULL) { \
tstate->c_profileobj, \ if (x == NULL) { \
tstate->frame, PyTrace_C_EXCEPTION, \ call_trace_protected(tstate->c_profilefunc, \
func)) \ tstate->c_profileobj, \
{ return NULL; } \ tstate->frame, PyTrace_C_EXCEPTION, \
} else { \ func); \
if (call_trace(tstate->c_profilefunc, \ /* XXX should pass (type, value, tb) */ \
tstate->c_profileobj, \ } else { \
tstate->frame, PyTrace_C_RETURN, \ if (call_trace(tstate->c_profilefunc, \
func)) \ tstate->c_profileobj, \
{ return NULL; } \ tstate->frame, PyTrace_C_RETURN, \
func)) { \
Py_DECREF(x); \
x = NULL; \
} \
} \
} \ } \
} \ } \
} else { \ } else { \
call; \ x = call; \
} }
static PyObject * static PyObject *
@ -3556,11 +3561,11 @@ call_function(PyObject ***pp_stack, int oparg
PyCFunction meth = PyCFunction_GET_FUNCTION(func); PyCFunction meth = PyCFunction_GET_FUNCTION(func);
PyObject *self = PyCFunction_GET_SELF(func); PyObject *self = PyCFunction_GET_SELF(func);
if (flags & METH_NOARGS && na == 0) { if (flags & METH_NOARGS && na == 0) {
C_TRACE(x=(*meth)(self,NULL)); C_TRACE(x, (*meth)(self,NULL));
} }
else if (flags & METH_O && na == 1) { else if (flags & METH_O && na == 1) {
PyObject *arg = EXT_POP(*pp_stack); PyObject *arg = EXT_POP(*pp_stack);
C_TRACE(x=(*meth)(self,arg)); C_TRACE(x, (*meth)(self,arg));
Py_DECREF(arg); Py_DECREF(arg);
} }
else { else {
@ -3572,7 +3577,7 @@ call_function(PyObject ***pp_stack, int oparg
PyObject *callargs; PyObject *callargs;
callargs = load_args(pp_stack, na); callargs = load_args(pp_stack, na);
READ_TIMESTAMP(*pintr0); READ_TIMESTAMP(*pintr0);
C_TRACE(x=PyCFunction_Call(func,callargs,NULL)); C_TRACE(x, PyCFunction_Call(func,callargs,NULL));
READ_TIMESTAMP(*pintr1); READ_TIMESTAMP(*pintr1);
Py_XDECREF(callargs); Py_XDECREF(callargs);
} }