adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

perf report: Filter to parent set by default

Browse source 
Make it easier to use parent filtering - default to a filtered
output. Also add the parent column so that we get collapsing but
dont display it by default.

add --no-exclude-other to override this.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-06-18 14:32:19 +02:00
parent 9d91a6f7a4
commit b8e6d82972
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/Makefile
View file

@ -164,7 +164,7 @@ endif
# CFLAGS and LDFLAGS are for the users to override from the command line. # CFLAGS and LDFLAGS are for the users to override from the command line.
CFLAGS = $(M64) -ggdb3 -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -std=gnu99 -Wdeclaration-after-statement -O6 CFLAGS = $(M64) -ggdb3 -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -std=gnu99 -Wdeclaration-after-statement -Werror -O6
LDFLAGS = -lpthread -lrt -lelf -lm LDFLAGS = -lpthread -lrt -lelf -lm
ALL_CFLAGS = $(CFLAGS) ALL_CFLAGS = $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS) ALL_LDFLAGS = $(LDFLAGS)

30
tools/perf/builtin-report.c
View file

@ -46,9 +46,12 @@ static int full_paths;
static unsigned long page_size; static unsigned long page_size;
static unsigned long mmap_window = 32; static unsigned long mmap_window = 32;
static char *parent_pattern = "^sys_|^do_page_fault"; static char default_parent_pattern[] = "^sys_|^do_page_fault";
static char *parent_pattern = default_parent_pattern;
static regex_t parent_regex; static regex_t parent_regex;
static int exclude_other = 1;
struct ip_event { struct ip_event {
struct perf_event_header header; struct perf_event_header header;
__u64 ip; __u64 ip;
@ -742,6 +745,9 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, __u64 total_samples)
struct sort_entry *se; struct sort_entry *se;
size_t ret; size_t ret;
if (exclude_other && !self->parent)
return 0;
if (total_samples) { if (total_samples) {
double percent = self->count * 100.0 / total_samples; double percent = self->count * 100.0 / total_samples;
char *color = PERF_COLOR_NORMAL; char *color = PERF_COLOR_NORMAL;
@ -764,6 +770,9 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, __u64 total_samples)
ret = fprintf(fp, "%12Ld ", self->count); ret = fprintf(fp, "%12Ld ", self->count);
list_for_each_entry(se, &hist_entry__sort_list, list) { list_for_each_entry(se, &hist_entry__sort_list, list) {
if (exclude_other && (se == &sort_parent))
continue;
fprintf(fp, " "); fprintf(fp, " ");
ret += se->print(fp, self); ret += se->print(fp, self);
} }
@ -855,6 +864,7 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
.ip = ip, .ip = ip,
.level = level, .level = level,
.count = count, .count = count,
.parent = NULL,
}; };
int cmp; int cmp;
@ -1029,14 +1039,20 @@ static size_t output__fprintf(FILE *fp, __u64 total_samples)
fprintf(fp, "#\n"); fprintf(fp, "#\n");
fprintf(fp, "# Overhead"); fprintf(fp, "# Overhead");
list_for_each_entry(se, &hist_entry__sort_list, list) list_for_each_entry(se, &hist_entry__sort_list, list) {
if (exclude_other && (se == &sort_parent))
continue;
fprintf(fp, " %s", se->header); fprintf(fp, " %s", se->header);
}
fprintf(fp, "\n"); fprintf(fp, "\n");
fprintf(fp, "# ........"); fprintf(fp, "# ........");
list_for_each_entry(se, &hist_entry__sort_list, list) { list_for_each_entry(se, &hist_entry__sort_list, list) {
int i; int i;
if (exclude_other && (se == &sort_parent))
continue;
fprintf(fp, " "); fprintf(fp, " ");
for (i = 0; i < strlen(se->header); i++) for (i = 0; i < strlen(se->header); i++)
fprintf(fp, "."); fprintf(fp, ".");
@ -1050,7 +1066,8 @@ static size_t output__fprintf(FILE *fp, __u64 total_samples)
ret += hist_entry__fprintf(fp, pos, total_samples); ret += hist_entry__fprintf(fp, pos, total_samples);
} }
if (!strcmp(sort_order, default_sort_order)) { if (sort_order == default_sort_order &&
parent_pattern == default_parent_pattern) {
fprintf(fp, "#\n"); fprintf(fp, "#\n");
fprintf(fp, "# (For more details, try: perf report --sort comm,dso,symbol)\n"); fprintf(fp, "# (For more details, try: perf report --sort comm,dso,symbol)\n");
fprintf(fp, "#\n"); fprintf(fp, "#\n");
@ -1508,6 +1525,8 @@ static const struct option options[] = {
"Don't shorten the pathnames taking into account the cwd"), "Don't shorten the pathnames taking into account the cwd"),
OPT_STRING('p', "parent", &parent_pattern, "regex", OPT_STRING('p', "parent", &parent_pattern, "regex",
"regex filter to identify parent, see: '--sort parent'"), "regex filter to identify parent, see: '--sort parent'"),
OPT_BOOLEAN('x', "exclude-other", &exclude_other,
"Only display entries with parent-match"),
OPT_END() OPT_END()
}; };
@ -1536,6 +1555,11 @@ int cmd_report(int argc, const char **argv, const char *prefix)
setup_sorting(); setup_sorting();
if (parent_pattern != default_parent_pattern)
sort_dimension__add("parent");
else
exclude_other = 0;
/* /*
* Any (unrecognized) arguments left? * Any (unrecognized) arguments left?
*/ */