summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/sort.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-11-12 21:47:31 +0100
committerIngo Molnar <mingo@kernel.org>2013-11-12 21:48:38 +0100
commitd969135aae1434547f41853f0e8eaa622e8b8816 (patch)
tree2b790ec0967620423e227c49873f06812b325037 /tools/perf/util/sort.c
parent9b66bfb28049594fe2bb2b91607ba302f511ce8b (diff)
parent0497a9ebaf7ae4d573497b3e053ad4c3d5c9921d (diff)
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: * Add summary only option to 'perf trace', suppressing the decoding of events, from David Ahern * 'perf trace --summary' formatting simplifications, from Pekka Emberg. * Beautify fifth argument of mmap() as fd, in 'perf trace', from Namhyung Kim. * Fix segfault on perf trace -i perf.data, from Namhyung Kim. * Fix segfault with --no-mmap-pages, from David Ahern. * Round mmap pages to power 2, from David Ahern. * Add direct access to dynamic arrays in libtraceevent, from Steven Rostedt. * Handle throttle events in 'object code reading' test, fix from Adrian Hunter. * Prevent condition that all sort keys are elided, fix from Namhyung Kim. * Synthesize non-exec MMAP records when --data used, allowing the resolution of data addresses to symbols (global variables, etc). * Don't force a refresh during progress update in the TUI, greatly reducing startup costs, fix from Patrick Palka. * Fix sw clock event period test wrt not checking if using > max_sample_freq. * Code cleanups by David Ahern and Adrian Hunter. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/sort.c')
-rw-r--r--tools/perf/util/sort.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 3c1b75c8b9a..8b0bb1f4494 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1137,6 +1137,8 @@ static void sort_entry__setup_elide(struct sort_entry *se,
void sort__setup_elide(FILE *output)
{
+ struct sort_entry *se;
+
sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list,
"dso", output);
sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list,
@@ -1172,4 +1174,15 @@ void sort__setup_elide(FILE *output)
"snoop", output);
}
+ /*
+ * It makes no sense to elide all of sort entries.
+ * Just revert them to show up again.
+ */
+ list_for_each_entry(se, &hist_entry__sort_list, list) {
+ if (!se->elide)
+ return;
+ }
+
+ list_for_each_entry(se, &hist_entry__sort_list, list)
+ se->elide = false;
}