summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2002-08-04 08:24:49 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2002-08-04 08:24:49 (GMT)
commit7d6e19d70c8137b6c7635777d2274fef85276c1f (patch)
tree45d410d14da394dc0d396b881d4d7fe668e19613 /Modules
parent5a3953027433f1928314af6cbb1be215357b55ad (diff)
downloadcpython-7d6e19d70c8137b6c7635777d2274fef85276c1f.zip
cpython-7d6e19d70c8137b6c7635777d2274fef85276c1f.tar.gz
cpython-7d6e19d70c8137b6c7635777d2274fef85276c1f.tar.bz2
Add trace_frame. Fixes #534864. Backported to 2.2.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/pyexpat.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index d259998..fc419b1 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -264,6 +264,33 @@ getcode(enum HandlerTypes slot, char* func_name, int lineno)
return NULL;
}
+static int
+trace_frame(PyThreadState *tstate, PyFrameObject *f, int code, PyObject *val)
+{
+ int result = 0;
+ if (!tstate->use_tracing || tstate->tracing)
+ return 0;
+ if (tstate->c_profilefunc != NULL) {
+ tstate->tracing++;
+ result = tstate->c_profilefunc(tstate->c_profileobj,
+ f, code , val);
+ tstate->use_tracing = ((tstate->c_tracefunc != NULL)
+ || (tstate->c_profilefunc != NULL));
+ tstate->tracing--;
+ if (result)
+ return result;
+ }
+ if (tstate->c_tracefunc != NULL) {
+ tstate->tracing++;
+ result = tstate->c_tracefunc(tstate->c_traceobj,
+ f, code , val);
+ tstate->use_tracing = ((tstate->c_tracefunc != NULL)
+ || (tstate->c_profilefunc != NULL));
+ tstate->tracing--;
+ }
+ return result;
+}
+
static PyObject*
call_with_frame(PyCodeObject *c, PyObject* func, PyObject* args)
{
@@ -273,6 +300,7 @@ call_with_frame(PyCodeObject *c, PyObject* func, PyObject* args)
if (c == NULL)
return NULL;
+
f = PyFrame_New(
tstate, /*back*/
c, /*code*/
@@ -282,9 +310,19 @@ call_with_frame(PyCodeObject *c, PyObject* func, PyObject* args)
if (f == NULL)
return NULL;
tstate->frame = f;
+ if (trace_frame(tstate, f, PyTrace_CALL, Py_None)) {
+ Py_DECREF(f);
+ return NULL;
+ }
res = PyEval_CallObject(func, args);
if (res == NULL && tstate->curexc_traceback == NULL)
PyTraceBack_Here(f);
+ else {
+ if (trace_frame(tstate, f, PyTrace_RETURN, res)) {
+ Py_XDECREF(res);
+ res = NULL;
+ }
+ }
tstate->frame = f->f_back;
Py_DECREF(f);
return res;