提交 1aa16738 编写于 作者: P Peter Zijlstra 提交者: Ingo Molnar

perf_counter: tools: report: Dynamic sort/print bits

Make the sorting and printing dynamic.
Signed-off-by: NPeter 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: <20090527182100.921953817@chello.nl>
Signed-off-by: NIngo Molnar <mingo@elte.hu>
上级 e7fb08b1
...@@ -699,14 +699,41 @@ struct hist_entry { ...@@ -699,14 +699,41 @@ struct hist_entry {
uint32_t count; uint32_t count;
}; };
/*
* configurable sorting bits
*/
struct sort_entry {
struct list_head list;
int64_t (*cmp)(struct hist_entry *, struct hist_entry *);
size_t (*print)(FILE *fp, struct hist_entry *);
};
static int64_t static int64_t
hist_entry__cmp(struct hist_entry *left, struct hist_entry *right) sort__thread_cmp(struct hist_entry *left, struct hist_entry *right)
{ {
uint64_t ip_l, ip_r; return right->thread->pid - left->thread->pid;
int cmp = right->thread->pid - left->thread->pid; }
if (cmp) static size_t
return cmp; sort__thread_print(FILE *fp, struct hist_entry *self)
{
char bf[32];
return fprintf(fp, "%14s ",
thread__name(self->thread, bf, sizeof(bf)));
}
static struct sort_entry sort_thread = {
.cmp = sort__thread_cmp,
.print = sort__thread_print,
};
static int64_t
sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
{
uint64_t ip_l, ip_r;
if (left->sym == right->sym) if (left->sym == right->sym)
return 0; return 0;
...@@ -717,6 +744,79 @@ hist_entry__cmp(struct hist_entry *left, struct hist_entry *right) ...@@ -717,6 +744,79 @@ hist_entry__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(FILE *fp, struct hist_entry *self)
{
size_t ret = 0;
ret += fprintf(fp, "[%c] ", self->level);
if (verbose)
ret += fprintf(fp, "%#018llx ", (unsigned long long)self->ip);
if (self->level != '.')
ret += fprintf(fp, "%s ",
self->sym ? self->sym->name : "<unknown>");
else
ret += fprintf(fp, "%s: %s ",
self->dso ? self->dso->name : "<unknown>",
self->sym ? self->sym->name : "<unknown>");
return ret;
}
static struct sort_entry sort_sym = {
.cmp = sort__sym_cmp,
.print = sort__sym_print,
};
static LIST_HEAD(hist_entry__sort_list);
static void setup_sorting(void)
{
list_add_tail(&sort_thread.list, &hist_entry__sort_list);
list_add_tail(&sort_sym.list, &hist_entry__sort_list);
}
static int64_t
hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)
{
struct sort_entry *se;
int64_t cmp = 0;
list_for_each_entry(se, &hist_entry__sort_list, list) {
cmp = se->cmp(left, right);
if (cmp)
break;
}
return cmp;
}
static size_t
hist_entry__fprintf(FILE *fp, struct hist_entry *self, uint64_t total_samples)
{
struct sort_entry *se;
size_t ret;
if (total_samples) {
ret = fprintf(fp, "%5.2f%% ",
(self->count * 100.0) / total_samples);
} else
ret = fprintf(fp, "%12d ", self->count);
list_for_each_entry(se, &hist_entry__sort_list, list)
ret += se->print(fp, self);
ret += fprintf(fp, "\n");
return ret;
}
/*
* collect histogram counts
*/
static int static int
hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
struct symbol *sym, uint64_t ip, char level) struct symbol *sym, uint64_t ip, char level)
...@@ -762,35 +862,6 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, ...@@ -762,35 +862,6 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
return 0; return 0;
} }
static size_t
hist_entry__fprintf(FILE *fp, struct hist_entry *self, uint64_t total_samples)
{
char bf[32];
size_t ret;
if (total_samples) {
ret = fprintf(fp, "%5.2f%% ",
(self->count * 100.0) / total_samples);
} else
ret = fprintf(fp, "%12d ", self->count);
ret += fprintf(fp, "%14s [%c] ",
thread__name(self->thread, bf, sizeof(bf)),
self->level);
if (verbose)
ret += fprintf(fp, "%#018llx ", (unsigned long long)self->ip);
if (self->level != '.')
ret += fprintf(fp, "%s\n",
self->sym ? self->sym->name : "<unknown>");
else
ret += fprintf(fp, "%s: %s\n",
self->dso ? self->dso->name : "<unknown>",
self->sym ? self->sym->name : "<unknown>");
return ret;
}
/* /*
* reverse the map, sort on count. * reverse the map, sort on count.
*/ */
...@@ -1077,6 +1148,8 @@ int cmd_report(int argc, const char **argv, const char *prefix) ...@@ -1077,6 +1148,8 @@ int cmd_report(int argc, const char **argv, const char *prefix)
parse_options(argc, argv, options, report_usage, 0); parse_options(argc, argv, options, report_usage, 0);
setup_sorting();
setup_pager(); setup_pager();
return __cmd_report(); return __cmd_report();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册