2009-09-24 16:02:49 +00:00
|
|
|
#include "sort.h"
|
|
|
|
|
|
|
|
regex_t parent_regex;
|
2010-05-17 19:22:41 +00:00
|
|
|
const char default_parent_pattern[] = "^sys_|^do_page_fault";
|
|
|
|
const char *parent_pattern = default_parent_pattern;
|
|
|
|
const char default_sort_order[] = "comm,dso,symbol";
|
|
|
|
const char *sort_order = default_sort_order;
|
2009-10-22 21:23:22 +00:00
|
|
|
int sort__need_collapse = 0;
|
|
|
|
int sort__has_parent = 0;
|
perf tools: Bind callchains to the first sort dimension column
Currently, the callchains are displayed using a constant left
margin. So depending on the current sort dimension
configuration, callchains may appear to be well attached to the
first sort dimension column field which is mostly the case,
except when the first dimension of sorting is done by comm,
because these are right aligned.
This patch binds the callchain to the first letter in the first
column, whatever type of column it is (dso, comm, symbol).
Before:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
After:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
Also, for clarity, we don't put anymore the callchain as is but:
- If we have a top level ancestor in the callchain, start it
with a first ascii hook.
Before:
0.80% perf [kernel] [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
After:
0.80% perf [kernel] [k] __lock_acquire
|
--- __lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
- Otherwise, if we have several top level ancestors, then
display these like we did before:
1.69% Xorg
|
|--21.21%-- vread_hpet
| 0x7fffd85b46fc
| 0x7fffd85b494d
| 0x7f4fafb4e54d
|
|--15.15%-- exaOffscreenAlloc
|
|--9.09%-- I830WaitLpRing
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
LKML-Reference: <1256246604-17156-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-22 21:23:23 +00:00
|
|
|
|
|
|
|
enum sort_type sort__first_dimension;
|
2009-09-24 16:02:49 +00:00
|
|
|
|
|
|
|
unsigned int dsos__col_width;
|
|
|
|
unsigned int comms__col_width;
|
|
|
|
unsigned int threads__col_width;
|
2010-06-04 14:27:10 +00:00
|
|
|
unsigned int cpus__col_width;
|
2009-09-24 16:02:49 +00:00
|
|
|
static unsigned int parent_symbol__col_width;
|
|
|
|
char * field_sep;
|
|
|
|
|
|
|
|
LIST_HEAD(hist_entry__sort_list);
|
|
|
|
|
2010-03-31 14:33:40 +00:00
|
|
|
static int hist_entry__thread_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width);
|
|
|
|
static int hist_entry__comm_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width);
|
|
|
|
static int hist_entry__dso_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width);
|
|
|
|
static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width);
|
|
|
|
static int hist_entry__parent_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width);
|
2010-06-04 14:27:10 +00:00
|
|
|
static int hist_entry__cpu_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width);
|
2010-03-31 14:33:40 +00:00
|
|
|
|
2009-09-24 16:02:49 +00:00
|
|
|
struct sort_entry sort_thread = {
|
2010-04-14 17:11:29 +00:00
|
|
|
.se_header = "Command: Pid",
|
|
|
|
.se_cmp = sort__thread_cmp,
|
|
|
|
.se_snprintf = hist_entry__thread_snprintf,
|
|
|
|
.se_width = &threads__col_width,
|
2009-09-24 16:02:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct sort_entry sort_comm = {
|
2010-04-14 17:11:29 +00:00
|
|
|
.se_header = "Command",
|
|
|
|
.se_cmp = sort__comm_cmp,
|
|
|
|
.se_collapse = sort__comm_collapse,
|
|
|
|
.se_snprintf = hist_entry__comm_snprintf,
|
|
|
|
.se_width = &comms__col_width,
|
2009-09-24 16:02:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct sort_entry sort_dso = {
|
2010-04-14 17:11:29 +00:00
|
|
|
.se_header = "Shared Object",
|
|
|
|
.se_cmp = sort__dso_cmp,
|
|
|
|
.se_snprintf = hist_entry__dso_snprintf,
|
|
|
|
.se_width = &dsos__col_width,
|
2009-09-24 16:02:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct sort_entry sort_sym = {
|
2010-04-14 17:11:29 +00:00
|
|
|
.se_header = "Symbol",
|
|
|
|
.se_cmp = sort__sym_cmp,
|
|
|
|
.se_snprintf = hist_entry__sym_snprintf,
|
2009-09-24 16:02:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct sort_entry sort_parent = {
|
2010-04-14 17:11:29 +00:00
|
|
|
.se_header = "Parent symbol",
|
|
|
|
.se_cmp = sort__parent_cmp,
|
|
|
|
.se_snprintf = hist_entry__parent_snprintf,
|
|
|
|
.se_width = &parent_symbol__col_width,
|
2009-09-24 16:02:49 +00:00
|
|
|
};
|
2010-06-04 14:27:10 +00:00
|
|
|
|
|
|
|
struct sort_entry sort_cpu = {
|
|
|
|
.se_header = "CPU",
|
|
|
|
.se_cmp = sort__cpu_cmp,
|
|
|
|
.se_snprintf = hist_entry__cpu_snprintf,
|
|
|
|
.se_width = &cpus__col_width,
|
|
|
|
};
|
2009-09-24 16:02:49 +00:00
|
|
|
|
|
|
|
struct sort_dimension {
|
|
|
|
const char *name;
|
|
|
|
struct sort_entry *entry;
|
|
|
|
int taken;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct sort_dimension sort_dimensions[] = {
|
|
|
|
{ .name = "pid", .entry = &sort_thread, },
|
|
|
|
{ .name = "comm", .entry = &sort_comm, },
|
|
|
|
{ .name = "dso", .entry = &sort_dso, },
|
|
|
|
{ .name = "symbol", .entry = &sort_sym, },
|
|
|
|
{ .name = "parent", .entry = &sort_parent, },
|
2010-06-04 14:27:10 +00:00
|
|
|
{ .name = "cpu", .entry = &sort_cpu, },
|
2009-09-24 16:02:49 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
int64_t cmp_null(void *l, void *r)
|
|
|
|
{
|
|
|
|
if (!l && !r)
|
|
|
|
return 0;
|
|
|
|
else if (!l)
|
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* --sort pid */
|
|
|
|
|
|
|
|
int64_t
|
|
|
|
sort__thread_cmp(struct hist_entry *left, struct hist_entry *right)
|
|
|
|
{
|
|
|
|
return right->thread->pid - left->thread->pid;
|
|
|
|
}
|
|
|
|
|
2010-03-31 14:33:40 +00:00
|
|
|
static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)
|
2009-09-24 16:02:49 +00:00
|
|
|
{
|
|
|
|
int n;
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
2010-03-31 14:33:40 +00:00
|
|
|
n = vsnprintf(bf, size, fmt, ap);
|
|
|
|
if (field_sep && n > 0) {
|
|
|
|
char *sep = bf;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
sep = strchr(sep, *field_sep);
|
|
|
|
if (sep == NULL)
|
|
|
|
break;
|
|
|
|
*sep = '.';
|
2009-09-24 16:02:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
va_end(ap);
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2010-03-31 14:33:40 +00:00
|
|
|
static int hist_entry__thread_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width)
|
2009-09-24 16:02:49 +00:00
|
|
|
{
|
2010-03-31 14:33:40 +00:00
|
|
|
return repsep_snprintf(bf, size, "%*s:%5d", width,
|
2009-09-24 16:02:49 +00:00
|
|
|
self->thread->comm ?: "", self->thread->pid);
|
|
|
|
}
|
|
|
|
|
2010-03-31 14:33:40 +00:00
|
|
|
static int hist_entry__comm_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width)
|
2009-09-24 16:02:49 +00:00
|
|
|
{
|
2010-03-31 14:33:40 +00:00
|
|
|
return repsep_snprintf(bf, size, "%*s", width, self->thread->comm);
|
2009-09-24 16:02:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* --sort dso */
|
|
|
|
|
|
|
|
int64_t
|
|
|
|
sort__dso_cmp(struct hist_entry *left, struct hist_entry *right)
|
|
|
|
{
|
2010-03-24 19:40:17 +00:00
|
|
|
struct dso *dso_l = left->ms.map ? left->ms.map->dso : NULL;
|
|
|
|
struct dso *dso_r = right->ms.map ? right->ms.map->dso : NULL;
|
2009-10-02 06:29:58 +00:00
|
|
|
const char *dso_name_l, *dso_name_r;
|
2009-09-24 16:02:49 +00:00
|
|
|
|
|
|
|
if (!dso_l || !dso_r)
|
|
|
|
return cmp_null(dso_l, dso_r);
|
|
|
|
|
2009-10-02 06:29:58 +00:00
|
|
|
if (verbose) {
|
|
|
|
dso_name_l = dso_l->long_name;
|
|
|
|
dso_name_r = dso_r->long_name;
|
|
|
|
} else {
|
|
|
|
dso_name_l = dso_l->short_name;
|
|
|
|
dso_name_r = dso_r->short_name;
|
|
|
|
}
|
|
|
|
|
|
|
|
return strcmp(dso_name_l, dso_name_r);
|
2009-09-24 16:02:49 +00:00
|
|
|
}
|
|
|
|
|
2010-03-31 14:33:40 +00:00
|
|
|
static int hist_entry__dso_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width)
|
2009-09-24 16:02:49 +00:00
|
|
|
{
|
2010-03-24 19:40:17 +00:00
|
|
|
if (self->ms.map && self->ms.map->dso) {
|
|
|
|
const char *dso_name = !verbose ? self->ms.map->dso->short_name :
|
|
|
|
self->ms.map->dso->long_name;
|
2010-03-31 14:33:40 +00:00
|
|
|
return repsep_snprintf(bf, size, "%-*s", width, dso_name);
|
2009-10-02 06:29:58 +00:00
|
|
|
}
|
2009-09-24 16:02:49 +00:00
|
|
|
|
2010-03-31 14:33:40 +00:00
|
|
|
return repsep_snprintf(bf, size, "%*Lx", width, self->ip);
|
2009-09-24 16:02:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* --sort symbol */
|
|
|
|
|
|
|
|
int64_t
|
|
|
|
sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
|
|
|
|
{
|
|
|
|
u64 ip_l, ip_r;
|
|
|
|
|
2010-03-24 19:40:17 +00:00
|
|
|
if (left->ms.sym == right->ms.sym)
|
2009-09-24 16:02:49 +00:00
|
|
|
return 0;
|
|
|
|
|
2010-03-24 19:40:17 +00:00
|
|
|
ip_l = left->ms.sym ? left->ms.sym->start : left->ip;
|
|
|
|
ip_r = right->ms.sym ? right->ms.sym->start : right->ip;
|
2009-09-24 16:02:49 +00:00
|
|
|
|
|
|
|
return (int64_t)(ip_r - ip_l);
|
|
|
|
}
|
|
|
|
|
2010-03-31 14:33:40 +00:00
|
|
|
static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width __used)
|
2009-09-24 16:02:49 +00:00
|
|
|
{
|
|
|
|
size_t ret = 0;
|
|
|
|
|
2009-10-02 06:29:58 +00:00
|
|
|
if (verbose) {
|
2010-03-24 19:40:17 +00:00
|
|
|
char o = self->ms.map ? dso__symtab_origin(self->ms.map->dso) : '!';
|
2010-03-31 14:33:40 +00:00
|
|
|
ret += repsep_snprintf(bf, size, "%#018llx %c ", self->ip, o);
|
2009-10-02 06:29:58 +00:00
|
|
|
}
|
2009-09-24 16:02:49 +00:00
|
|
|
|
2010-03-31 14:33:40 +00:00
|
|
|
ret += repsep_snprintf(bf + ret, size - ret, "[%c] ", self->level);
|
2010-03-24 19:40:17 +00:00
|
|
|
if (self->ms.sym)
|
2010-03-31 14:33:40 +00:00
|
|
|
ret += repsep_snprintf(bf + ret, size - ret, "%s",
|
|
|
|
self->ms.sym->name);
|
2009-10-02 06:29:58 +00:00
|
|
|
else
|
2010-03-31 14:33:40 +00:00
|
|
|
ret += repsep_snprintf(bf + ret, size - ret, "%#016llx", self->ip);
|
2009-09-24 16:02:49 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* --sort comm */
|
|
|
|
|
|
|
|
int64_t
|
|
|
|
sort__comm_cmp(struct hist_entry *left, struct hist_entry *right)
|
|
|
|
{
|
|
|
|
return right->thread->pid - left->thread->pid;
|
|
|
|
}
|
|
|
|
|
|
|
|
int64_t
|
|
|
|
sort__comm_collapse(struct hist_entry *left, struct hist_entry *right)
|
|
|
|
{
|
|
|
|
char *comm_l = left->thread->comm;
|
|
|
|
char *comm_r = right->thread->comm;
|
|
|
|
|
|
|
|
if (!comm_l || !comm_r)
|
|
|
|
return cmp_null(comm_l, comm_r);
|
|
|
|
|
|
|
|
return strcmp(comm_l, comm_r);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* --sort parent */
|
|
|
|
|
|
|
|
int64_t
|
|
|
|
sort__parent_cmp(struct hist_entry *left, struct hist_entry *right)
|
|
|
|
{
|
|
|
|
struct symbol *sym_l = left->parent;
|
|
|
|
struct symbol *sym_r = right->parent;
|
|
|
|
|
|
|
|
if (!sym_l || !sym_r)
|
|
|
|
return cmp_null(sym_l, sym_r);
|
|
|
|
|
|
|
|
return strcmp(sym_l->name, sym_r->name);
|
|
|
|
}
|
|
|
|
|
2010-03-31 14:33:40 +00:00
|
|
|
static int hist_entry__parent_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width)
|
2009-09-24 16:02:49 +00:00
|
|
|
{
|
2010-03-31 14:33:40 +00:00
|
|
|
return repsep_snprintf(bf, size, "%-*s", width,
|
2009-09-24 16:02:49 +00:00
|
|
|
self->parent ? self->parent->name : "[other]");
|
|
|
|
}
|
|
|
|
|
2010-06-04 14:27:10 +00:00
|
|
|
/* --sort cpu */
|
|
|
|
|
|
|
|
int64_t
|
|
|
|
sort__cpu_cmp(struct hist_entry *left, struct hist_entry *right)
|
|
|
|
{
|
|
|
|
return right->cpu - left->cpu;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int hist_entry__cpu_snprintf(struct hist_entry *self, char *bf,
|
|
|
|
size_t size, unsigned int width)
|
|
|
|
{
|
|
|
|
return repsep_snprintf(bf, size, "%-*d", width, self->cpu);
|
|
|
|
}
|
|
|
|
|
2009-09-24 16:02:49 +00:00
|
|
|
int sort_dimension__add(const char *tok)
|
|
|
|
{
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(sort_dimensions); i++) {
|
|
|
|
struct sort_dimension *sd = &sort_dimensions[i];
|
|
|
|
|
|
|
|
if (sd->taken)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (strncasecmp(tok, sd->name, strlen(tok)))
|
|
|
|
continue;
|
|
|
|
|
2010-04-14 17:11:29 +00:00
|
|
|
if (sd->entry->se_collapse)
|
2009-09-24 16:02:49 +00:00
|
|
|
sort__need_collapse = 1;
|
|
|
|
|
|
|
|
if (sd->entry == &sort_parent) {
|
|
|
|
int ret = regcomp(&parent_regex, parent_pattern, REG_EXTENDED);
|
|
|
|
if (ret) {
|
|
|
|
char err[BUFSIZ];
|
|
|
|
|
|
|
|
regerror(ret, &parent_regex, err, sizeof(err));
|
2010-04-02 15:30:57 +00:00
|
|
|
pr_err("Invalid regex: %s\n%s", parent_pattern, err);
|
|
|
|
return -EINVAL;
|
2009-09-24 16:02:49 +00:00
|
|
|
}
|
|
|
|
sort__has_parent = 1;
|
|
|
|
}
|
|
|
|
|
perf tools: Bind callchains to the first sort dimension column
Currently, the callchains are displayed using a constant left
margin. So depending on the current sort dimension
configuration, callchains may appear to be well attached to the
first sort dimension column field which is mostly the case,
except when the first dimension of sorting is done by comm,
because these are right aligned.
This patch binds the callchain to the first letter in the first
column, whatever type of column it is (dso, comm, symbol).
Before:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
After:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
Also, for clarity, we don't put anymore the callchain as is but:
- If we have a top level ancestor in the callchain, start it
with a first ascii hook.
Before:
0.80% perf [kernel] [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
After:
0.80% perf [kernel] [k] __lock_acquire
|
--- __lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
- Otherwise, if we have several top level ancestors, then
display these like we did before:
1.69% Xorg
|
|--21.21%-- vread_hpet
| 0x7fffd85b46fc
| 0x7fffd85b494d
| 0x7f4fafb4e54d
|
|--15.15%-- exaOffscreenAlloc
|
|--9.09%-- I830WaitLpRing
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
LKML-Reference: <1256246604-17156-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-22 21:23:23 +00:00
|
|
|
if (list_empty(&hist_entry__sort_list)) {
|
|
|
|
if (!strcmp(sd->name, "pid"))
|
|
|
|
sort__first_dimension = SORT_PID;
|
|
|
|
else if (!strcmp(sd->name, "comm"))
|
|
|
|
sort__first_dimension = SORT_COMM;
|
|
|
|
else if (!strcmp(sd->name, "dso"))
|
|
|
|
sort__first_dimension = SORT_DSO;
|
|
|
|
else if (!strcmp(sd->name, "symbol"))
|
|
|
|
sort__first_dimension = SORT_SYM;
|
|
|
|
else if (!strcmp(sd->name, "parent"))
|
|
|
|
sort__first_dimension = SORT_PARENT;
|
2010-06-04 14:27:10 +00:00
|
|
|
else if (!strcmp(sd->name, "cpu"))
|
|
|
|
sort__first_dimension = SORT_CPU;
|
perf tools: Bind callchains to the first sort dimension column
Currently, the callchains are displayed using a constant left
margin. So depending on the current sort dimension
configuration, callchains may appear to be well attached to the
first sort dimension column field which is mostly the case,
except when the first dimension of sorting is done by comm,
because these are right aligned.
This patch binds the callchain to the first letter in the first
column, whatever type of column it is (dso, comm, symbol).
Before:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
After:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
Also, for clarity, we don't put anymore the callchain as is but:
- If we have a top level ancestor in the callchain, start it
with a first ascii hook.
Before:
0.80% perf [kernel] [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
After:
0.80% perf [kernel] [k] __lock_acquire
|
--- __lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
- Otherwise, if we have several top level ancestors, then
display these like we did before:
1.69% Xorg
|
|--21.21%-- vread_hpet
| 0x7fffd85b46fc
| 0x7fffd85b494d
| 0x7f4fafb4e54d
|
|--15.15%-- exaOffscreenAlloc
|
|--9.09%-- I830WaitLpRing
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
LKML-Reference: <1256246604-17156-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-22 21:23:23 +00:00
|
|
|
}
|
2009-10-22 21:23:22 +00:00
|
|
|
|
2009-09-24 16:02:49 +00:00
|
|
|
list_add_tail(&sd->entry->list, &hist_entry__sort_list);
|
|
|
|
sd->taken = 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -ESRCH;
|
|
|
|
}
|
2009-12-14 22:09:29 +00:00
|
|
|
|
|
|
|
void setup_sorting(const char * const usagestr[], const struct option *opts)
|
|
|
|
{
|
|
|
|
char *tmp, *tok, *str = strdup(sort_order);
|
|
|
|
|
|
|
|
for (tok = strtok_r(str, ", ", &tmp);
|
|
|
|
tok; tok = strtok_r(NULL, ", ", &tmp)) {
|
|
|
|
if (sort_dimension__add(tok) < 0) {
|
|
|
|
error("Unknown --sort key: `%s'", tok);
|
|
|
|
usage_with_options(usagestr, opts);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
free(str);
|
|
|
|
}
|
perf diff: Use perf_session__fprintf_hists just like 'perf record'
That means that almost everything you can do with 'perf report'
can be done with 'perf diff', for instance:
$ perf record -f find / > /dev/null
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.062 MB perf.data (~2699
samples) ] $ perf record -f find / > /dev/null
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.062 MB perf.data (~2687
samples) ] perf diff | head -8
9.02% +1.00% find libc-2.10.1.so [.] _IO_vfprintf_internal
2.91% -1.00% find [kernel] [k] __kmalloc
2.85% -1.00% find [kernel] [k] ext4_htree_store_dirent
1.99% -1.00% find [kernel] [k] _atomic_dec_and_lock
2.44% find [kernel] [k] half_md4_transform
$
So if you want to zoom into libc:
$ perf diff --dsos libc-2.10.1.so | head -8
37.34% find [.] _IO_vfprintf_internal
10.34% find [.] __GI_memmove
8.25% +2.00% find [.] _int_malloc
5.07% -1.00% find [.] __GI_mempcpy
7.62% +2.00% find [.] _int_free
$
And if there were multiple commands using libc, it is also
possible to aggregate them all by using --sort symbol:
$ perf diff --dsos libc-2.10.1.so --sort symbol | head -8
37.34% [.] _IO_vfprintf_internal
10.34% [.] __GI_memmove
8.25% +2.00% [.] _int_malloc
5.07% -1.00% [.] __GI_mempcpy
7.62% +2.00% [.] _int_free
$
The displacement column now is off by default, to use it:
perf diff -m --dsos libc-2.10.1.so --sort symbol | head -8
37.34% [.] _IO_vfprintf_internal
10.34% [.] __GI_memmove
8.25% +2.00% [.] _int_malloc
5.07% -1.00% +2 [.] __GI_mempcpy
7.62% +2.00% -1 [.] _int_free
$
Using -t/--field-separator can be used for scripting:
$ perf diff -t, -m --dsos libc-2.10.1.so --sort symbol | head -8
37.34, , ,[.] _IO_vfprintf_internal
10.34, , ,[.] __GI_memmove
8.25,+2.00%, ,[.] _int_malloc
5.07,-1.00%, +2,[.] __GI_mempcpy
7.62,+2.00%, -1,[.] _int_free
6.99,+1.00%, -1,[.] _IO_new_file_xsputn
1.89,-2.00%, +4,[.] __readdir64
$
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260978567-550-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-16 15:49:27 +00:00
|
|
|
|
|
|
|
void sort_entry__setup_elide(struct sort_entry *self, struct strlist *list,
|
|
|
|
const char *list_name, FILE *fp)
|
|
|
|
{
|
|
|
|
if (list && strlist__nr_entries(list) == 1) {
|
|
|
|
if (fp != NULL)
|
|
|
|
fprintf(fp, "# %s: %s\n", list_name,
|
|
|
|
strlist__entry(list, 0)->s);
|
|
|
|
self->elide = true;
|
|
|
|
}
|
|
|
|
}
|