leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf evsel: Allow specifying a file to output in perf_evsel__print_ip

Browse Source 
As this function will be used in 'perf trace'.

Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/n/tip-8x297v9utnxq77onikevvlse@git.kernel.org
[ Split from a larger patch ]
Signed-off-by: Milian Wolff <milian.wolff@kdab.com>
This commit is contained in:
Milian Wolff
2016-04-11 10:18:11 -03:00
committed by Arnaldo Carvalho de Melo
parent 72c0809856
commit 6186de9a49
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/builtin-script.c
View File

@@ -580,7 +580,7 @@ static void print_sample_bts(struct perf_sample *sample,
} }
} }
perf_evsel__print_ip(evsel, sample, al, print_opts, perf_evsel__print_ip(evsel, sample, al, print_opts,
scripting_max_stack); scripting_max_stack, stdout);
} }
/* print branch_to information */ /* print branch_to information */
@@ -790,7 +790,7 @@ static void process_event(struct perf_script *script,
perf_evsel__print_ip(evsel, sample, al, perf_evsel__print_ip(evsel, sample, al,
output[attr->type].print_ip_opts, output[attr->type].print_ip_opts,
scripting_max_stack); scripting_max_stack, stdout);
} }
if (PRINT_FIELD(IREGS)) if (PRINT_FIELD(IREGS))

39
tools/perf/util/session.c
View File

@@ -1955,7 +1955,8 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample, void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample,
struct addr_location *al, struct addr_location *al,
unsigned int print_opts, unsigned int stack_depth) unsigned int print_opts, unsigned int stack_depth,
FILE *fp)
{ {
struct callchain_cursor_node *node; struct callchain_cursor_node *node;
int print_ip = print_opts & PRINT_IP_OPT_IP; int print_ip = print_opts & PRINT_IP_OPT_IP;
@@ -1992,33 +1993,35 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample,
goto next; goto next;
if (print_ip) if (print_ip)
printf("%c%16" PRIx64, s, node->ip); fprintf(fp, "%c%16" PRIx64, s, node->ip);
if (node->map) if (node->map)
addr = node->map->map_ip(node->map, node->ip); addr = node->map->map_ip(node->map, node->ip);
if (print_sym) { if (print_sym) {
printf(" "); fprintf(fp, " ");
if (print_symoffset) { if (print_symoffset) {
node_al.addr = addr; node_al.addr = addr;
node_al.map = node->map; node_al.map = node->map;
symbol__fprintf_symname_offs(node->sym, &node_al, stdout); symbol__fprintf_symname_offs(node->sym,
&node_al,
fp);
} else } else
symbol__fprintf_symname(node->sym, stdout); symbol__fprintf_symname(node->sym, fp);
} }
if (print_dso) { if (print_dso) {
printf(" ("); fprintf(fp, " (");
map__fprintf_dsoname(node->map, stdout); map__fprintf_dsoname(node->map, fp);
printf(")"); fprintf(fp, ")");
} }
if (print_srcline) if (print_srcline)
map__fprintf_srcline(node->map, addr, "\n ", map__fprintf_srcline(node->map, addr, "\n ",
stdout); fp);
if (!print_oneline) if (!print_oneline)
printf("\n"); fprintf(fp, "\n");
stack_depth--; stack_depth--;
next: next:
@@ -2030,25 +2033,25 @@ next:
return; return;
if (print_ip) if (print_ip)
printf("%16" PRIx64, sample->ip); fprintf(fp, "%16" PRIx64, sample->ip);
if (print_sym) { if (print_sym) {
printf(" "); fprintf(fp, " ");
if (print_symoffset) if (print_symoffset)
symbol__fprintf_symname_offs(al->sym, al, symbol__fprintf_symname_offs(al->sym, al,
stdout); fp);
else else
symbol__fprintf_symname(al->sym, stdout); symbol__fprintf_symname(al->sym, fp);
} }
if (print_dso) { if (print_dso) {
printf(" ("); fprintf(fp, " (");
map__fprintf_dsoname(al->map, stdout); map__fprintf_dsoname(al->map, fp);
printf(")"); fprintf(fp, ")");
} }
if (print_srcline) if (print_srcline)
map__fprintf_srcline(al->map, al->addr, "\n ", stdout); map__fprintf_srcline(al->map, al->addr, "\n ", fp);
} }
} }

3
tools/perf/util/session.h
View File

@@ -106,7 +106,8 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample, void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample,
struct addr_location *al, struct addr_location *al,
unsigned int print_opts, unsigned int stack_depth); unsigned int print_opts, unsigned int stack_depth,
FILE *fp);
int perf_session__cpu_bitmap(struct perf_session *session, int perf_session__cpu_bitmap(struct perf_session *session,
const char *cpu_list, unsigned long *cpu_bitmap); const char *cpu_list, unsigned long *cpu_bitmap);