perf report: Simplify symbol output

The DSO can be printed already - no need to repeat it in the
symbol field.

Signed-off-by: Peter 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: Ingo Molnar <mingo@elte.hu>

diff --git a/Documentation/perf_counter/builtin-report.c b/Documentation/perf_counter/builtin-report.c
index ff6f657476a933c4896f8cd3f839846212c21a54..56c664d1b628196e539138d24e24b6579a95f4b4 100644 (file)
--- a/Documentation/perf_counter/builtin-report.c
+++ b/Documentation/perf_counter/builtin-report.c
@@ -382,7 +382,7 @@ sort__comm_print(FILE *fp, struct hist_entry *self)
 }
 
 static struct sort_entry sort_comm = {
-       .header         = "          Command",
+       .header         = "          Command",
        .cmp            = sort__comm_cmp,
        .collapse       = sort__comm_collapse,
        .print          = sort__comm_print,
@@ -414,11 +414,11 @@ sort__dso_print(FILE *fp, struct hist_entry *self)
        if (self->dso)
                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 = {
-       .header = " Shared Object          ",
+       .header = " Shared Object            ",
        .cmp    = sort__dso_cmp,
        .print  = sort__dso_print,
 };
@@ -447,21 +447,16 @@ sort__sym_print(FILE *fp, struct hist_entry *self)
        if (verbose)
                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)
-               ret += fprintf(fp, "%s", self->sym->name);
+               ret += fprintf(fp, "  %s", self->sym->name);
        else
-               ret += fprintf(fp, "%#016llx", (__u64)self->ip);
+               ret += fprintf(fp, "  %#016llx", (__u64)self->ip);
 
        return ret;
 }
 
 static struct sort_entry sort_sym = {
-       .header = " Shared Object: Symbol",
+       .header = " Symbol",
        .cmp    = sort__sym_cmp,
        .print  = sort__sym_print,
 };