perf evsel: Require that callchains be resolved before calling fprintf_{sym,callchain}
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 6f736735e30f51805f6be31d20a4bf5b0ae91bae Gitweb: http://git.kernel.org/tip/6f736735e30f51805f6be31d20a4bf5b0ae91bae Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 14 Apr 2016 17:45:51 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 14 Apr 2016 19:46:56 -0300
perf evsel: Require that callchains be resolved before calling fprintf_{sym,callchain}
This way the print routine merely does printing, not requiring access to the resolving machinery, which helps disentangling the object files and easing creating subsets with a limited functionality set.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-script.c | 36 ++++++++++++++++++++---------------- tools/perf/builtin-trace.c | 8 +++++--- tools/perf/util/evsel.c | 39 ++++++++++++++------------------------- tools/perf/util/evsel.h | 19 +++++++++---------- 4 files changed, 48 insertions(+), 54 deletions(-)
tools/perf/builtin-script.c +20 -16
@@ -569,19 +569,23 @@ static void print_sample_bts(struct perf_sample *sample,/* print branch_from information */ if (PRINT_FIELD (IP )) {unsigned int print_opts = output[attr->type].print_ip_opts; +struct callchain_cursor *cursor =NULL , cursor_callchain; -if (symbol_conf.use_callchain && sample->callchain) { -printf ("\n" ); - }else { -printf (" " ); +if (symbol_conf.use_callchain && sample->callchain && +thread__resolve_callchain (al->thread, &cursor_callchain, evsel, + sample,NULL ,NULL , scripting_max_stack) ==0 ) + cursor = &cursor_callchain; + +if (cursor ==NULL ) { +putchar (' ' );if (print_opts &EVSEL__PRINT_SRCLINE ) { print_srcline_last = true; print_opts &= ~EVSEL__PRINT_SRCLINE ; } - } -perf_evsel__fprintf_sym (evsel, sample, al,0 , print_opts, - symbol_conf.use_callchain, - scripting_max_stack, stdout); + }else +putchar ('\n' ); + +sample__fprintf_sym (sample, al,0 , print_opts, cursor, stdout); }/* print branch_to information */
@@ -784,15 +788,15 @@ static void process_event(struct perf_script *script,printf ("%16" PRIu64, sample->weight);if (PRINT_FIELD (IP )) { -if (!symbol_conf.use_callchain) -printf (" " ); -else -printf ("\n" ); +struct callchain_cursor *cursor =NULL , cursor_callchain; + +if (symbol_conf.use_callchain && +thread__resolve_callchain (al->thread, &cursor_callchain, evsel, + sample,NULL ,NULL , scripting_max_stack) ==0 ) + cursor = &cursor_callchain; -perf_evsel__fprintf_sym (evsel, sample, al,0 , - output[attr->type].print_ip_opts, - symbol_conf.use_callchain, - scripting_max_stack, stdout); +putchar (cursor ?'\n' :' ' ); +sample__fprintf_sym (sample, al,0 , output[attr->type].print_ip_opts, cursor, stdout); }if (PRINT_FIELD (IREGS ))
tools/perf/builtin-trace.c +5 -3
@@ -1890,14 +1890,16 @@ static int trace__fprintf_callchain(struct trace *trace, struct perf_evsel *evseif (sample->callchain ==NULL )return 0 ; -if (machine__resolve (trace->host, &al, sample) <0 ) { +if (machine__resolve (trace->host, &al, sample) <0 || +thread__resolve_callchain (al.thread, &callchain_cursor, evsel, + sample,NULL ,NULL , scripting_max_stack)) {pr_err ("Problem processing %s callchain, skipping...\n" ,perf_evsel__name (evsel));return 0 ; } -return perf_evsel__fprintf_callchain (evsel, sample, &al,38 , print_opts, - scripting_max_stack, trace->output); +return sample__fprintf_callchain (sample, &al,38 , print_opts, + &callchain_cursor, trace->output); } static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
tools/perf/util/evsel.c +14 -25
@@ -2343,13 +2343,12 @@ out:return ++printed; } -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) +int sample__fprintf_callchain (struct perf_sample *sample, +struct addr_location *al,int left_alignment, +unsigned int print_opts,struct callchain_cursor *cursor, +FILE *fp) {int printed =0 ; -struct callchain_cursor cursor;struct callchain_cursor_node *node;int print_ip = print_opts &EVSEL__PRINT_IP ;int print_sym = print_opts &EVSEL__PRINT_SYM ;
@@ -2363,22 +2362,15 @@ int perf_evsel__fprintf_callchain(struct perf_evsel *evsel, struct perf_sample *if (sample->callchain) {struct addr_location node_al; -if (thread__resolve_callchain (al->thread, &cursor, evsel, - sample,NULL ,NULL , - stack_depth) !=0 ) { -if (verbose) -error ("Failed to resolve callchain. Skipping\n" ); -return printed; - } -callchain_cursor_commit (&cursor); +callchain_cursor_commit (cursor);if (print_symoffset) node_al = *al; -while (stack_depth) { +while (1 ) {u64 addr =0 ; - node =callchain_cursor_current (&cursor); + node =callchain_cursor_current (cursor);if (!node)break ;
@@ -2418,20 +2410,17 @@ int perf_evsel__fprintf_callchain(struct perf_evsel *evsel, struct perf_sample *if (!print_oneline) printed +=fprintf (fp,"\n" ); - - stack_depth--; next: -callchain_cursor_advance (&cursor); +callchain_cursor_advance (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,bool print_callchain, -unsigned int stack_depth,FILE *fp) +int sample__fprintf_sym (struct perf_sample *sample,struct addr_location *al, +int left_alignment,unsigned int print_opts, +struct callchain_cursor *cursor,FILE *fp) {int printed =0 ;int print_ip = print_opts &EVSEL__PRINT_IP ;
@@ -2441,9 +2430,9 @@ int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sampleint print_srcline = print_opts &EVSEL__PRINT_SRCLINE ;int print_unknown_as_addr = print_opts &EVSEL__PRINT_UNKNOWN_AS_ADDR ; -if (print_callchain && sample->callchain) { - printed +=perf_evsel__fprintf_callchain (evsel, sample, al, left_alignment, - print_opts, stack_depth, fp); +if (cursor !=NULL ) { + printed +=sample__fprintf_callchain (sample, al, left_alignment, + print_opts, cursor, fp); }else if (!(al->sym && al->sym->ignore)) { printed +=fprintf (fp,"%-*.*s" , left_alignment, left_alignment," " );
tools/perf/util/evsel.h +9 -10
@@ -395,16 +395,15 @@ int perf_evsel__fprintf(struct perf_evsel *evsel,#define EVSEL__PRINT_SRCLINE (1<<5)#define EVSEL__PRINT_UNKNOWN_AS_ADDR (1<<6) -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); - -int perf_evsel__fprintf_sym (struct perf_evsel *evsel,struct perf_sample *sample, -struct addr_location *al,int left_alignment, -unsigned int print_opts,bool print_callchain, -unsigned int stack_depth,FILE *fp); +struct callchain_cursor ; + +int sample__fprintf_callchain (struct perf_sample *sample,struct addr_location *al, +int left_alignment,unsigned int print_opts, +struct callchain_cursor *cursor,FILE *fp); + +int sample__fprintf_sym (struct perf_sample *sample,struct addr_location *al, +int left_alignment,unsigned int print_opts, +struct callchain_cursor *cursor,FILE *fp);bool perf_evsel__fallback (struct perf_evsel *evsel,int err,char *msg,size_t msgsize);