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

perf evsel: Allow passing a left alignment when printing a symbol

Browse Source 
For callchains, etc where we want it to align just below the syscall
name, for instance, in 'perf trace'

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-uk9ekchd67651c625ltaur5y@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2016-04-11 10:53:51 -03:00
parent 6186de9a49
commit db3617f362
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -579,7 +579,7 @@ static void print_sample_bts(struct perf_sample *sample,
print_opts &= ~PRINT_IP_OPT_SRCLINE; print_opts &= ~PRINT_IP_OPT_SRCLINE;
} }
} }
perf_evsel__print_ip(evsel, sample, al, print_opts, perf_evsel__print_ip(evsel, sample, al, 0, print_opts,
scripting_max_stack, stdout); scripting_max_stack, stdout);
} }
@@ -788,7 +788,7 @@ static void process_event(struct perf_script *script,
else else
printf("\n"); printf("\n");
perf_evsel__print_ip(evsel, sample, al, perf_evsel__print_ip(evsel, sample, al, 0,
output[attr->type].print_ip_opts, output[attr->type].print_ip_opts,
scripting_max_stack, stdout); scripting_max_stack, stdout);
} }

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

@@ -1954,7 +1954,7 @@ 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, int left_alignment,
unsigned int print_opts, unsigned int stack_depth, unsigned int print_opts, unsigned int stack_depth,
FILE *fp) FILE *fp)
{ {
@@ -1992,6 +1992,8 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, struct perf_sample *sample,
if (node->sym && node->sym->ignore) if (node->sym && node->sym->ignore)
goto next; goto next;
fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");
if (print_ip) if (print_ip)
fprintf(fp, "%c%16" PRIx64, s, node->ip); fprintf(fp, "%c%16" PRIx64, s, node->ip);
@@ -2032,6 +2034,8 @@ next:
if (al->sym && al->sym->ignore) if (al->sym && al->sym->ignore)
return; return;
fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");
if (print_ip) if (print_ip)
fprintf(fp, "%16" PRIx64, sample->ip); fprintf(fp, "%16" PRIx64, sample->ip);

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

@@ -105,7 +105,7 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session,
unsigned int type); unsigned int type);
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, int left_alignment,
unsigned int print_opts, unsigned int stack_depth, unsigned int print_opts, unsigned int stack_depth,
FILE *fp); FILE *fp);