mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Enable the profiling of C functions (builtins and extensions)

Browse source
This commit is contained in:
Nicholas Bastin 2004-03-24 21:57:10 +00:00
parent a1dde13389
commit c69ebe8d50
10 changed files with 145 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Python/ceval.c
View file

@ -536,9 +536,7 @@ _Py_CheckRecursiveCall(char *where)
return 0;
}
/* Status code for main loop (reason for stack unwind) */
enum why_code {
WHY_NOT, /* No error */
WHY_EXCEPTION, /* Exception occurred */
@ -3425,6 +3423,42 @@ err_args(PyObject *func, int flags, int nargs)
nargs);
}
#define BEGIN_C_TRACE \
if (tstate->use_tracing) { \
if (tstate->c_profilefunc != NULL) { \
PyObject *func_name = \
PyString_FromString (((PyCFunctionObject *) \
func)->m_ml->ml_name); \
are_tracing = 1; \
if (call_trace(tstate->c_profilefunc, \
tstate->c_profileobj, \
tstate->frame, PyTrace_C_CALL, \
func_name)) \
{ return NULL; } \
Py_DECREF (func_name); \
} \
}
#define END_C_TRACE \
if (tstate->use_tracing && are_tracing) { \
if (tstate->c_profilefunc != NULL) { \
if (x == NULL) { \
if (call_trace (tstate->c_profilefunc, \
tstate->c_profileobj, \
tstate->frame, PyTrace_C_EXCEPTION, \
NULL)) \
{ return NULL; } \
} else { \
if (call_trace(tstate->c_profilefunc, \
tstate->c_profileobj, \
tstate->frame, PyTrace_C_RETURN, \
NULL)) \
{ return NULL; } \
} \
} \
}
static PyObject *
call_function(PyObject ***pp_stack, int oparg)
{
@ -3435,6 +3469,10 @@ call_function(PyObject ***pp_stack, int oparg)
PyObject *func = *pfunc;
PyObject *x, *w;
int are_tracing = 0;
PyThreadState *tstate = PyThreadState_GET();
/* Always dispatch PyCFunction first, because these are
presumed to be the most frequent callable object.
*/
@ -3444,11 +3482,16 @@ call_function(PyObject ***pp_stack, int oparg)
if (flags & (METH_NOARGS | METH_O)) {
PyCFunction meth = PyCFunction_GET_FUNCTION(func);
PyObject *self = PyCFunction_GET_SELF(func);
if (flags & METH_NOARGS && na == 0)
if (flags & METH_NOARGS && na == 0) {
BEGIN_C_TRACE
x = (*meth)(self, NULL);
END_C_TRACE
}
else if (flags & METH_O && na == 1) {
PyObject *arg = EXT_POP(*pp_stack);
BEGIN_C_TRACE
x = (*meth)(self, arg);
END_C_TRACE
Py_DECREF(arg);
}
else {
@ -3459,7 +3502,9 @@ call_function(PyObject ***pp_stack, int oparg)
else {
PyObject *callargs;
callargs = load_args(pp_stack, na);
BEGIN_C_TRACE
x = PyCFunction_Call(func, callargs, NULL);
END_C_TRACE
Py_XDECREF(callargs);
}
} else {

7
Python/sysmodule.c
View file

@ -272,15 +272,16 @@ operating system filenames."
* Cached interned string objects used for calling the profile and
* trace functions. Initialized by trace_init().
*/
static PyObject *whatstrings[4] = {NULL, NULL, NULL, NULL};
static PyObject *whatstrings[7] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL};
static int
trace_init(void)
{
static char *whatnames[4] = {"call", "exception", "line", "return"};
static char *whatnames[7] = {"call", "exception", "line", "return",
"c_call", "c_exception", "c_return"};
PyObject *name;
int i;
for (i = 0; i < 4; ++i) {
for (i = 0; i < 7; ++i) {
if (whatstrings[i] == NULL) {
name = PyString_InternFromString(whatnames[i]);
if (name == NULL)