summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/sort.c
diff options
context:
space:
mode:
authorFrederic Weisbecker2009-10-22 23:23:22 +0200
committerIngo Molnar2009-10-23 07:55:16 +0200
commitaf0a6fa46388e1e0c2d1a672aad84f8f6ef0b20b (patch)
tree961592b767ecda1e2ac85b997f64bc1665f0b249 /tools/perf/util/sort.c
parentperf tools: Use strsep() over strtok_r() for parsing single line (diff)
downloadkernel-qcow2-linux-af0a6fa46388e1e0c2d1a672aad84f8f6ef0b20b.tar.gz
kernel-qcow2-linux-af0a6fa46388e1e0c2d1a672aad84f8f6ef0b20b.tar.xz
kernel-qcow2-linux-af0a6fa46388e1e0c2d1a672aad84f8f6ef0b20b.zip
perf tools: Fix missing top level callchain
While recursively printing the branches of each callchains, we forget to display the root. It is never printed. Say we have: symbol f1 f2 | -------- f3 | f4 | ---------f5 f6 Actually we never see that, instead it displays: symbol | --------- f3 | f4 | --------- f5 f6 However f1 is always the same than "symbol" and if we are sorting by symbols first then "symbol", f1 and f2 will be well aligned like in the above example, so displaying f1 looks redundant here. But if we are sorting by something else first (dso, comm, etc...), displaying f1 doesn't look redundant but rather necessary because the symbol is not well aligned anymore with its callchain: comm dso symbol f1 f2 | --------- [...] And we want the callchain to be obvious. So we fix the bug by printing the root branch, but we also filter its first entry if we are sorting by symbols first. Reported-by: Anton Blanchard <anton@samba.org> 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> LKML-Reference: <1256246604-17156-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/sort.c')
-rw-r--r--tools/perf/util/sort.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 40c9acd41cad..60ced707bd6b 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -5,8 +5,9 @@ char default_parent_pattern[] = "^sys_|^do_page_fault";
char *parent_pattern = default_parent_pattern;
char default_sort_order[] = "comm,dso,symbol";
char *sort_order = default_sort_order;
-int sort__need_collapse = 0;
-int sort__has_parent = 0;
+int sort__need_collapse = 0;
+int sort__has_parent = 0;
+int sort_by_sym_first;
unsigned int dsos__col_width;
unsigned int comms__col_width;
@@ -265,6 +266,10 @@ int sort_dimension__add(const char *tok)
sort__has_parent = 1;
}
+ if (list_empty(&hist_entry__sort_list) &&
+ !strcmp(sd->name, "symbol"))
+ sort_by_sym_first = true;
+
list_add_tail(&sd->entry->list, &hist_entry__sort_list);
sd->taken = 1;
@@ -273,4 +278,3 @@ int sort_dimension__add(const char *tok)
return -ESRCH;
}
-