mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
perf evsel: Introduce fprintf_callchain() method out of fprintf_sym()
In 'perf trace' we're just interested in printing callchains, and we don't want to use the symbol_conf.use_callchain, so move the callchain part to a new method. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Milian Wolff <milian.wolff@kdab.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-kcn3romzivcpxb3u75s9nz33@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
ff0c107806
commit
ea4539652e
3 changed files with 32 additions and 7 deletions
|
@ -2203,7 +2203,7 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
|
|||
event->header.type);
|
||||
goto out_put;
|
||||
}
|
||||
perf_evsel__fprintf_sym(evsel, sample, &al, 38, print_opts,
|
||||
perf_evsel__fprintf_callchain(evsel, sample, &al, 38, print_opts,
|
||||
scripting_max_stack, trace->output);
|
||||
}
|
||||
out:
|
||||
|
|
|
@ -381,6 +381,12 @@ struct perf_attr_details {
|
|||
int perf_evsel__fprintf(struct perf_evsel *evsel,
|
||||
struct perf_attr_details *details, FILE *fp);
|
||||
|
||||
int perf_evsel__fprintf_callchain(struct perf_evsel *evsel,
|
||||
struct perf_sample *sample,
|
||||
struct addr_location *al, int left_alignment,
|
||||
unsigned int print_opts,
|
||||
unsigned int stack_depth, FILE *fp);
|
||||
|
||||
bool perf_evsel__fallback(struct perf_evsel *evsel, int err,
|
||||
char *msg, size_t msgsize);
|
||||
int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target,
|
||||
|
|
|
@ -1953,7 +1953,7 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample,
|
||||
int perf_evsel__fprintf_callchain(struct perf_evsel *evsel, struct perf_sample *sample,
|
||||
struct addr_location *al, int left_alignment,
|
||||
unsigned int print_opts, unsigned int stack_depth,
|
||||
FILE *fp)
|
||||
|
@ -1968,7 +1968,7 @@ int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample
|
|||
int print_srcline = print_opts & PRINT_IP_OPT_SRCLINE;
|
||||
char s = print_oneline ? ' ' : '\t';
|
||||
|
||||
if (symbol_conf.use_callchain && sample->callchain) {
|
||||
if (sample->callchain) {
|
||||
struct addr_location node_al;
|
||||
|
||||
if (thread__resolve_callchain(al->thread, evsel,
|
||||
|
@ -2027,7 +2027,26 @@ int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample
|
|||
next:
|
||||
callchain_cursor_advance(&callchain_cursor);
|
||||
}
|
||||
}
|
||||
|
||||
return printed;
|
||||
}
|
||||
|
||||
int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample,
|
||||
struct addr_location *al, int left_alignment,
|
||||
unsigned int print_opts, unsigned int stack_depth,
|
||||
FILE *fp)
|
||||
{
|
||||
int printed = 0;
|
||||
int print_ip = print_opts & PRINT_IP_OPT_IP;
|
||||
int print_sym = print_opts & PRINT_IP_OPT_SYM;
|
||||
int print_dso = print_opts & PRINT_IP_OPT_DSO;
|
||||
int print_symoffset = print_opts & PRINT_IP_OPT_SYMOFFSET;
|
||||
int print_srcline = print_opts & PRINT_IP_OPT_SRCLINE;
|
||||
|
||||
if (symbol_conf.use_callchain && sample->callchain) {
|
||||
printed += perf_evsel__fprintf_callchain(evsel, sample, al, left_alignment,
|
||||
print_opts, stack_depth, fp);
|
||||
} else if (!(al->sym && al->sym->ignore)) {
|
||||
printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");
|
||||
|
||||
|
|
Loading…
Reference in a new issue