perf scripts python: Pass event/thread/dso name and symbol info to event handler in python
Also as suggested by Arnaldo, pack all these parameters to a dictionary, which is more expandable for adding new parameters while keeping the compatibility for old scripts. Signed-off-by: Feng Tang <feng.tang@intel.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Robert Richter <robert.richter@amd.com> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1344419875-21665-4-git-send-email-feng.tang@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
73994dc158
commit
fd6b858a1e
1 changed files with 29 additions and 6 deletions
|
@ -345,15 +345,23 @@ static void python_process_general_event(union perf_event *perf_event __unused,
|
||||||
struct machine *machine __unused,
|
struct machine *machine __unused,
|
||||||
struct addr_location *al __unused)
|
struct addr_location *al __unused)
|
||||||
{
|
{
|
||||||
PyObject *handler, *retval, *t;
|
PyObject *handler, *retval, *t, *dict;
|
||||||
static char handler_name[64];
|
static char handler_name[64];
|
||||||
unsigned n = 0;
|
unsigned n = 0;
|
||||||
void *data = sample->raw_data;
|
struct thread *thread = al->thread;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Use the MAX_FIELDS to make the function expandable, though
|
||||||
|
* currently there is only one itme for the tuple.
|
||||||
|
*/
|
||||||
t = PyTuple_New(MAX_FIELDS);
|
t = PyTuple_New(MAX_FIELDS);
|
||||||
if (!t)
|
if (!t)
|
||||||
Py_FatalError("couldn't create Python tuple");
|
Py_FatalError("couldn't create Python tuple");
|
||||||
|
|
||||||
|
dict = PyDict_New();
|
||||||
|
if (!dict)
|
||||||
|
Py_FatalError("couldn't create Python dictionary");
|
||||||
|
|
||||||
snprintf(handler_name, sizeof(handler_name), "%s", "process_event");
|
snprintf(handler_name, sizeof(handler_name), "%s", "process_event");
|
||||||
|
|
||||||
handler = PyDict_GetItemString(main_dict, handler_name);
|
handler = PyDict_GetItemString(main_dict, handler_name);
|
||||||
|
@ -362,11 +370,25 @@ static void python_process_general_event(union perf_event *perf_event __unused,
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Pass 4 parameters: event_attr, perf_sample, raw data, thread name */
|
PyDict_SetItemString(dict, "ev_name", PyString_FromString(perf_evsel__name(evsel)));
|
||||||
PyTuple_SetItem(t, n++, PyString_FromStringAndSize((void *)&evsel->attr, sizeof(evsel->attr)));
|
PyDict_SetItemString(dict, "attr", PyString_FromStringAndSize(
|
||||||
PyTuple_SetItem(t, n++, PyString_FromStringAndSize((void *)sample, sizeof(*sample)));
|
(const char *)&evsel->attr, sizeof(evsel->attr)));
|
||||||
PyTuple_SetItem(t, n++, PyString_FromStringAndSize(data, sample->raw_size));
|
PyDict_SetItemString(dict, "sample", PyString_FromStringAndSize(
|
||||||
|
(const char *)sample, sizeof(*sample)));
|
||||||
|
PyDict_SetItemString(dict, "raw_buf", PyString_FromStringAndSize(
|
||||||
|
(const char *)sample->raw_data, sample->raw_size));
|
||||||
|
PyDict_SetItemString(dict, "comm",
|
||||||
|
PyString_FromString(thread->comm));
|
||||||
|
if (al->map) {
|
||||||
|
PyDict_SetItemString(dict, "dso",
|
||||||
|
PyString_FromString(al->map->dso->name));
|
||||||
|
}
|
||||||
|
if (al->sym) {
|
||||||
|
PyDict_SetItemString(dict, "symbol",
|
||||||
|
PyString_FromString(al->sym->name));
|
||||||
|
}
|
||||||
|
|
||||||
|
PyTuple_SetItem(t, n++, dict);
|
||||||
if (_PyTuple_Resize(&t, n) == -1)
|
if (_PyTuple_Resize(&t, n) == -1)
|
||||||
Py_FatalError("error resizing Python tuple");
|
Py_FatalError("error resizing Python tuple");
|
||||||
|
|
||||||
|
@ -374,6 +396,7 @@ static void python_process_general_event(union perf_event *perf_event __unused,
|
||||||
if (retval == NULL)
|
if (retval == NULL)
|
||||||
handler_call_die(handler_name);
|
handler_call_die(handler_name);
|
||||||
exit:
|
exit:
|
||||||
|
Py_DECREF(dict);
|
||||||
Py_DECREF(t);
|
Py_DECREF(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue