diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-02-06 11:04:39 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-02-06 11:04:39 +0100 |
commit | 0fc6d1ca14ebe1c405c0ad0a33a3811747d20506 (patch) | |
tree | 6cf75f93f025e8908d47dc76e80cbd5b7441f009 /tools/perf/ui | |
parent | Merge tag 'perf-core-for-mingo-4.11-20170201' of git://git.kernel.org/pub/scm... (diff) | |
parent | Merge tag 'perf-urgent-for-mingo-4.10-20170203' of git://git.kernel.org/pub/s... (diff) | |
download | linux-0fc6d1ca14ebe1c405c0ad0a33a3811747d20506.tar.xz linux-0fc6d1ca14ebe1c405c0ad0a33a3811747d20506.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui')
-rw-r--r-- | tools/perf/ui/hist.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 37388397b5bc..18cfcdc90356 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -521,6 +521,12 @@ void perf_hpp_list__register_sort_field(struct perf_hpp_list *list, list_add_tail(&format->sort_list, &list->sorts); } +void perf_hpp_list__prepend_sort_field(struct perf_hpp_list *list, + struct perf_hpp_fmt *format) +{ + list_add(&format->sort_list, &list->sorts); +} + void perf_hpp__column_unregister(struct perf_hpp_fmt *format) { list_del(&format->list); @@ -560,6 +566,10 @@ void perf_hpp__setup_output_field(struct perf_hpp_list *list) perf_hpp_list__for_each_sort_list(list, fmt) { struct perf_hpp_fmt *pos; + /* skip sort-only fields ("sort_compute" in perf diff) */ + if (!fmt->entry && !fmt->color) + continue; + perf_hpp_list__for_each_format(list, pos) { if (fmt_equal(fmt, pos)) goto next; |