lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pref_counter: tools: report: Add header printout & prettify

Browse Source 
Old default output:

 3.12%    perf-report [.] ./perf-report:       dsos__find
 2.44%    perf-report [k] kernel:              kallsyms_expand_symbol
 2.28%          :4483 [.] <unknown>:           <unknown>
 2.05%          :4174 [k] kernel:              _spin_lock_irqsave
 2.01%    perf-report [k] kernel:              vsnprintf
 1.92%    perf-report [k] kernel:              format_decode
 1.92%          :4438 [k] kernel:              _spin_lock

New default output:

 #
 # Overhead          Command       File: Symbol
 # ........          .......       ............
 #
      6.54%             perf  [k]  kernel: kallsyms_expand_symbol
      6.26%             perf  [.]  /home/mingo/tip/Documentation/perf_counter/perf: dso__insert_symbol
      4.76%             perf  [.]  /home/mingo/tip/Documentation/perf_counter/perf: hex2long
      4.55%             perf  [k]  kernel: number
      4.48%             perf  [k]  kernel: format_decode
      4.09%             perf  [k]  kernel: vsnprintf

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <20090527182101.229504802@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-05-27 21:36:22 +02:00
parent 55e5ec41a9
commit 2d65537ee7
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Documentation/perf_counter/builtin-report.c
View File

@@ -708,6 +708,7 @@ struct sort_entry {
struct list_head list; struct list_head list;
int64_t (*cmp)(struct hist_entry *, struct hist_entry *); int64_t (*cmp)(struct hist_entry *, struct hist_entry *);
size_t (*print_header)(FILE *fp);
size_t (*print)(FILE *fp, struct hist_entry *); size_t (*print)(FILE *fp, struct hist_entry *);
}; };
@@ -722,7 +723,7 @@ sort__thread_print(FILE *fp, struct hist_entry *self)
{ {
char bf[32]; char bf[32];
return fprintf(fp, "%14s ", return fprintf(fp, " %16s",
thread__name(self->thread, bf, sizeof(bf))); thread__name(self->thread, bf, sizeof(bf)));
} }
@@ -752,7 +753,7 @@ sort__comm_cmp(struct hist_entry *left, struct hist_entry *right)
static size_t static size_t
sort__comm_print(FILE *fp, struct hist_entry *self) sort__comm_print(FILE *fp, struct hist_entry *self)
{ {
return fprintf(fp, "%20s ", self->thread->comm ?: "<unknown>"); return fprintf(fp, " %16s", self->thread->comm ?: "<unknown>");
} }
static struct sort_entry sort_comm = { static struct sort_entry sort_comm = {
@@ -781,7 +782,7 @@ sort__dso_cmp(struct hist_entry *left, struct hist_entry *right)
static size_t static size_t
sort__dso_print(FILE *fp, struct hist_entry *self) sort__dso_print(FILE *fp, struct hist_entry *self)
{ {
return fprintf(fp, "%64s ", self->dso ? self->dso->name : "<unknown>"); return fprintf(fp, " %64s", self->dso ? self->dso->name : "<unknown>");
} }
static struct sort_entry sort_dso = { static struct sort_entry sort_dso = {
@@ -803,21 +804,33 @@ sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
return (int64_t)(ip_r - ip_l); return (int64_t)(ip_r - ip_l);
} }
static size_t sort__sym_print_header(FILE *fp)
{
size_t ret = 0;
ret += fprintf(fp, "#\n");
ret += fprintf(fp, "# Overhead Command File: Symbol\n");
ret += fprintf(fp, "# ........ ....... ............\n");
ret += fprintf(fp, "#\n");
return ret;
}
static size_t static size_t
sort__sym_print(FILE *fp, struct hist_entry *self) sort__sym_print(FILE *fp, struct hist_entry *self)
{ {
size_t ret = 0; size_t ret = 0;
ret += fprintf(fp, "[%c] ", self->level); ret += fprintf(fp, " [%c] ", self->level);
if (verbose) if (verbose)
ret += fprintf(fp, "%#018llx ", (unsigned long long)self->ip); ret += fprintf(fp, " %#018llx", (unsigned long long)self->ip);
if (self->level != '.') if (self->level != '.')
ret += fprintf(fp, "%s ", ret += fprintf(fp, " kernel: %s",
self->sym ? self->sym->name : "<unknown>"); self->sym ? self->sym->name : "<unknown>");
else else
ret += fprintf(fp, "%s: %s ", ret += fprintf(fp, " %s: %s",
self->dso ? self->dso->name : "<unknown>", self->dso ? self->dso->name : "<unknown>",
self->sym ? self->sym->name : "<unknown>"); self->sym ? self->sym->name : "<unknown>");
@@ -826,6 +839,7 @@ sort__sym_print(FILE *fp, struct hist_entry *self)
static struct sort_entry sort_sym = { static struct sort_entry sort_sym = {
.cmp = sort__sym_cmp, .cmp = sort__sym_cmp,
.print_header = sort__sym_print_header,
.print = sort__sym_print, .print = sort__sym_print,
}; };
@@ -898,7 +912,7 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, uint64_t total_samples)
size_t ret; size_t ret;
if (total_samples) { if (total_samples) {
ret = fprintf(fp, "%5.2f%% ", ret = fprintf(fp, " %5.2f%%",
(self->count * 100.0) / total_samples); (self->count * 100.0) / total_samples);
} else } else
ret = fprintf(fp, "%12d ", self->count); ret = fprintf(fp, "%12d ", self->count);
@@ -1003,9 +1017,15 @@ static void output__resort(void)
static size_t output__fprintf(FILE *fp, uint64_t total_samples) static size_t output__fprintf(FILE *fp, uint64_t total_samples)
{ {
struct hist_entry *pos; struct hist_entry *pos;
struct sort_entry *se;
struct rb_node *nd; struct rb_node *nd;
size_t ret = 0; size_t ret = 0;
list_for_each_entry(se, &hist_entry__sort_list, list) {
if (se->print_header)
ret += se->print_header(fp);
}
for (nd = rb_first(&output_hists); nd; nd = rb_next(nd)) { for (nd = rb_first(&output_hists); nd; nd = rb_next(nd)) {
pos = rb_entry(nd, struct hist_entry, rb_node); pos = rb_entry(nd, struct hist_entry, rb_node);
ret += hist_entry__fprintf(fp, pos, total_samples); ret += hist_entry__fprintf(fp, pos, total_samples);