Commit 95ed6fd0 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

perf report: Simplify symbol output

The DSO can be printed already - no need to repeat it in the
symbol field.
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent af794b94
...@@ -382,7 +382,7 @@ sort__comm_print(FILE *fp, struct hist_entry *self) ...@@ -382,7 +382,7 @@ sort__comm_print(FILE *fp, struct hist_entry *self)
} }
static struct sort_entry sort_comm = { static struct sort_entry sort_comm = {
.header = " Command", .header = " Command",
.cmp = sort__comm_cmp, .cmp = sort__comm_cmp,
.collapse = sort__comm_collapse, .collapse = sort__comm_collapse,
.print = sort__comm_print, .print = sort__comm_print,
...@@ -414,11 +414,11 @@ sort__dso_print(FILE *fp, struct hist_entry *self) ...@@ -414,11 +414,11 @@ sort__dso_print(FILE *fp, struct hist_entry *self)
if (self->dso) if (self->dso)
return fprintf(fp, " %-25s", self->dso->name); return fprintf(fp, " %-25s", self->dso->name);
return fprintf(fp, " %016llx", (__u64)self->ip); return fprintf(fp, " %016llx ", (__u64)self->ip);
} }
static struct sort_entry sort_dso = { static struct sort_entry sort_dso = {
.header = " Shared Object ", .header = " Shared Object ",
.cmp = sort__dso_cmp, .cmp = sort__dso_cmp,
.print = sort__dso_print, .print = sort__dso_print,
}; };
...@@ -447,21 +447,16 @@ sort__sym_print(FILE *fp, struct hist_entry *self) ...@@ -447,21 +447,16 @@ sort__sym_print(FILE *fp, struct hist_entry *self)
if (verbose) if (verbose)
ret += fprintf(fp, " %#018llx", (__u64)self->ip); ret += fprintf(fp, " %#018llx", (__u64)self->ip);
if (self->dso)
ret += fprintf(fp, " %s: ", self->dso->name);
else
ret += fprintf(fp, " %#016llx: ", (__u64)self->ip);
if (self->sym) if (self->sym)
ret += fprintf(fp, "%s", self->sym->name); ret += fprintf(fp, " %s", self->sym->name);
else else
ret += fprintf(fp, "%#016llx", (__u64)self->ip); ret += fprintf(fp, " %#016llx", (__u64)self->ip);
return ret; return ret;
} }
static struct sort_entry sort_sym = { static struct sort_entry sort_sym = {
.header = " Shared Object: Symbol", .header = " Symbol",
.cmp = sort__sym_cmp, .cmp = sort__sym_cmp,
.print = sort__sym_print, .print = sort__sym_print,
}; };
......
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