Skip to content

L
linux
Commit 3f8e009e authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files
Options

perf scripting python: Add 'addr_location' for 'addr' 

If sample addr correlates to a symbol, add  "addr_dso", "addr_symbol", and
"addr_symoff" to python scripting.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: https://lore.kernel.org/r/20210525095112.1399-4-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8271b509
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 23 deletions
tools/perf/builtin-script.c
View file @ 3f8e009e
...@@ -2189,10 +2189,19 @@ static int process_sample_event(struct perf_tool *tool, ...@@ -2189,10 +2189,19 @@ static int process_sample_event(struct perf_tool *tool,
if (filter_cpu(sample)) if (filter_cpu(sample))
goto out_put; goto out_put;
if (scripting_ops) if (scripting_ops) {
scripting_ops->process_event(event, sample, evsel, &al); struct addr_location *addr_al_ptr = NULL;
else struct addr_location addr_al;
if ((evsel->core.attr.sample_type & PERF_SAMPLE_ADDR) &&
sample_addr_correlates_sym(&evsel->core.attr)) {
thread__resolve(al.thread, &addr_al, sample);
addr_al_ptr = &addr_al;
}
scripting_ops->process_event(event, sample, evsel, &al, addr_al_ptr);
} else {
process_event(scr, sample, evsel, &al, machine); process_event(scr, sample, evsel, &al, machine);
}
out_put: out_put:
addr_location__put(&al); addr_location__put(&al);
......
tools/perf/util/db-export.c
View file @ 3f8e009e
...@@ -343,7 +343,7 @@ static int db_export__threads(struct db_export *dbe, struct thread *thread, ...@@ -343,7 +343,7 @@ static int db_export__threads(struct db_export *dbe, struct thread *thread,
int db_export__sample(struct db_export *dbe, union perf_event *event, int db_export__sample(struct db_export *dbe, union perf_event *event,
struct perf_sample *sample, struct evsel *evsel, struct perf_sample *sample, struct evsel *evsel,
struct addr_location *al) struct addr_location *al, struct addr_location *addr_al)
{ {
struct thread *thread = al->thread; struct thread *thread = al->thread;
struct export_sample es = { struct export_sample es = {
...@@ -389,18 +389,14 @@ int db_export__sample(struct db_export *dbe, union perf_event *event, ...@@ -389,18 +389,14 @@ int db_export__sample(struct db_export *dbe, union perf_event *event,
} }
} }
if ((evsel->core.attr.sample_type & PERF_SAMPLE_ADDR) && if (addr_al) {
sample_addr_correlates_sym(&evsel->core.attr)) { err = db_ids_from_al(dbe, addr_al, &es.addr_dso_db_id,
struct addr_location addr_al;
thread__resolve(thread, &addr_al, sample);
err = db_ids_from_al(dbe, &addr_al, &es.addr_dso_db_id,
&es.addr_sym_db_id, &es.addr_offset); &es.addr_sym_db_id, &es.addr_offset);
if (err) if (err)
goto out_put; goto out_put;
if (dbe->crp) { if (dbe->crp) {
err = thread_stack__process(thread, comm, sample, al, err = thread_stack__process(thread, comm, sample, al,
&addr_al, es.db_id, addr_al, es.db_id,
dbe->crp); dbe->crp);
if (err) if (err)
goto out_put; goto out_put;
......
tools/perf/util/db-export.h
View file @ 3f8e009e
...@@ -97,7 +97,7 @@ int db_export__branch_type(struct db_export *dbe, u32 branch_type, ...@@ -97,7 +97,7 @@ int db_export__branch_type(struct db_export *dbe, u32 branch_type,
const char *name); const char *name);
int db_export__sample(struct db_export *dbe, union perf_event *event, int db_export__sample(struct db_export *dbe, union perf_event *event,
struct perf_sample *sample, struct evsel *evsel, struct perf_sample *sample, struct evsel *evsel,
struct addr_location *al); struct addr_location *al, struct addr_location *addr_al);
int db_export__branch_types(struct db_export *dbe); int db_export__branch_types(struct db_export *dbe);
......
tools/perf/util/scripting-engines/trace-event-perl.c
View file @ 3f8e009e
...@@ -456,7 +456,8 @@ static void perl_process_event_generic(union perf_event *event, ...@@ -456,7 +456,8 @@ static void perl_process_event_generic(union perf_event *event,
static void perl_process_event(union perf_event *event, static void perl_process_event(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct evsel *evsel, struct evsel *evsel,
struct addr_location *al) struct addr_location *al,
struct addr_location *addr_al __maybe_unused)
{ {
perl_process_tracepoint(sample, evsel, al); perl_process_tracepoint(sample, evsel, al);
perl_process_event_generic(event, sample, evsel); perl_process_event_generic(event, sample, evsel);
......
tools/perf/util/scripting-engines/trace-event-python.c
View file @ 3f8e009e
...@@ -745,6 +745,7 @@ static void set_sym_in_dict(PyObject *dict, struct addr_location *al, ...@@ -745,6 +745,7 @@ static void set_sym_in_dict(PyObject *dict, struct addr_location *al,
static PyObject *get_perf_sample_dict(struct perf_sample *sample, static PyObject *get_perf_sample_dict(struct perf_sample *sample,
struct evsel *evsel, struct evsel *evsel,
struct addr_location *al, struct addr_location *al,
struct addr_location *addr_al,
PyObject *callchain) PyObject *callchain)
{ {
PyObject *dict, *dict_sample, *brstack, *brstacksym; PyObject *dict, *dict_sample, *brstack, *brstacksym;
...@@ -798,6 +799,12 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample, ...@@ -798,6 +799,12 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
brstacksym = python_process_brstacksym(sample, al->thread); brstacksym = python_process_brstacksym(sample, al->thread);
pydict_set_item_string_decref(dict, "brstacksym", brstacksym); pydict_set_item_string_decref(dict, "brstacksym", brstacksym);
if (addr_al) {
pydict_set_item_string_decref(dict_sample, "addr_correlates_sym",
PyBool_FromLong(1));
set_sym_in_dict(dict_sample, addr_al, "addr_dso", "addr_symbol", "addr_symoff");
}
set_regs_in_dict(dict, sample, evsel); set_regs_in_dict(dict, sample, evsel);
return dict; return dict;
...@@ -805,7 +812,8 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample, ...@@ -805,7 +812,8 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
static void python_process_tracepoint(struct perf_sample *sample, static void python_process_tracepoint(struct perf_sample *sample,
struct evsel *evsel, struct evsel *evsel,
struct addr_location *al) struct addr_location *al,
struct addr_location *addr_al)
{ {
struct tep_event *event = evsel->tp_format; struct tep_event *event = evsel->tp_format;
PyObject *handler, *context, *t, *obj = NULL, *callchain; PyObject *handler, *context, *t, *obj = NULL, *callchain;
...@@ -915,7 +923,7 @@ static void python_process_tracepoint(struct perf_sample *sample, ...@@ -915,7 +923,7 @@ static void python_process_tracepoint(struct perf_sample *sample,
PyTuple_SetItem(t, n++, dict); PyTuple_SetItem(t, n++, dict);
if (get_argument_count(handler) == (int) n + 1) { if (get_argument_count(handler) == (int) n + 1) {
all_entries_dict = get_perf_sample_dict(sample, evsel, al, all_entries_dict = get_perf_sample_dict(sample, evsel, al, addr_al,
callchain); callchain);
PyTuple_SetItem(t, n++, all_entries_dict); PyTuple_SetItem(t, n++, all_entries_dict);
} else { } else {
...@@ -1306,7 +1314,8 @@ static int python_process_call_return(struct call_return *cr, u64 *parent_db_id, ...@@ -1306,7 +1314,8 @@ static int python_process_call_return(struct call_return *cr, u64 *parent_db_id,
static void python_process_general_event(struct perf_sample *sample, static void python_process_general_event(struct perf_sample *sample,
struct evsel *evsel, struct evsel *evsel,
struct addr_location *al) struct addr_location *al,
struct addr_location *addr_al)
{ {
PyObject *handler, *t, *dict, *callchain; PyObject *handler, *t, *dict, *callchain;
static char handler_name[64]; static char handler_name[64];
...@@ -1328,7 +1337,7 @@ static void python_process_general_event(struct perf_sample *sample, ...@@ -1328,7 +1337,7 @@ static void python_process_general_event(struct perf_sample *sample,
/* ip unwinding */ /* ip unwinding */
callchain = python_process_callchain(sample, evsel, al); callchain = python_process_callchain(sample, evsel, al);
dict = get_perf_sample_dict(sample, evsel, al, callchain); dict = get_perf_sample_dict(sample, evsel, al, addr_al, callchain);
PyTuple_SetItem(t, n++, dict); PyTuple_SetItem(t, n++, dict);
if (_PyTuple_Resize(&t, n) == -1) if (_PyTuple_Resize(&t, n) == -1)
...@@ -1342,20 +1351,21 @@ static void python_process_general_event(struct perf_sample *sample, ...@@ -1342,20 +1351,21 @@ static void python_process_general_event(struct perf_sample *sample,
static void python_process_event(union perf_event *event, static void python_process_event(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct evsel *evsel, struct evsel *evsel,
struct addr_location *al) struct addr_location *al,
struct addr_location *addr_al)
{ {
struct tables *tables = &tables_global; struct tables *tables = &tables_global;
switch (evsel->core.attr.type) { switch (evsel->core.attr.type) {
case PERF_TYPE_TRACEPOINT: case PERF_TYPE_TRACEPOINT:
python_process_tracepoint(sample, evsel, al); python_process_tracepoint(sample, evsel, al, addr_al);
break; break;
/* Reserve for future process_hw/sw/raw APIs */ /* Reserve for future process_hw/sw/raw APIs */
default: default:
if (tables->db_export_mode) if (tables->db_export_mode)
db_export__sample(&tables->dbe, event, sample, evsel, al); db_export__sample(&tables->dbe, event, sample, evsel, al, addr_al);
else else
python_process_general_event(sample, evsel, al); python_process_general_event(sample, evsel, al, addr_al);
} }
} }
......
tools/perf/util/trace-event-scripting.c
View file @ 3f8e009e
...@@ -29,7 +29,8 @@ static int stop_script_unsupported(void) ...@@ -29,7 +29,8 @@ static int stop_script_unsupported(void)
static void process_event_unsupported(union perf_event *event __maybe_unused, static void process_event_unsupported(union perf_event *event __maybe_unused,
struct perf_sample *sample __maybe_unused, struct perf_sample *sample __maybe_unused,
struct evsel *evsel __maybe_unused, struct evsel *evsel __maybe_unused,
struct addr_location *al __maybe_unused) struct addr_location *al __maybe_unused,
struct addr_location *addr_al __maybe_unused)
{ {
} }
......
tools/perf/util/trace-event.h
View file @ 3f8e009e
...@@ -78,7 +78,8 @@ struct scripting_ops { ...@@ -78,7 +78,8 @@ struct scripting_ops {
void (*process_event) (union perf_event *event, void (*process_event) (union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct evsel *evsel, struct evsel *evsel,
struct addr_location *al); struct addr_location *al,
struct addr_location *addr_al);
void (*process_switch)(union perf_event *event, void (*process_switch)(union perf_event *event,
struct perf_sample *sample, struct perf_sample *sample,
struct machine *machine); struct machine *machine);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7