[tip:perf/core] perf hists: Count number of sort keys

From: tip-bot for Namhyung Kim
Date: Thu Feb 25 2016 - 02:43:51 EST


Commit-ID: 1f2d72cf3258eacd667cd1920e64c9b64b9984d5
Gitweb: http://git.kernel.org/tip/1f2d72cf3258eacd667cd1920e64c9b64b9984d5
Author: Namhyung Kim <namhyung@xxxxxxxxxx>
AuthorDate: Thu, 25 Feb 2016 00:13:40 +0900
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Wed, 24 Feb 2016 20:21:11 -0300

perf hists: Count number of sort keys

It'll be used for hierarchy output mode to indent entries properly.

Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/1456326830-30456-9-git-send-email-namhyung@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/ui/hist.c | 3 +++
tools/perf/util/hist.h | 1 +
2 files changed, 4 insertions(+)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 12223d7..edbf854 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -514,6 +514,9 @@ void perf_hpp_list__column_register(struct perf_hpp_list *list,
void perf_hpp_list__register_sort_field(struct perf_hpp_list *list,
struct perf_hpp_fmt *format)
{
+ if (perf_hpp__is_sort_entry(format) || perf_hpp__is_dynamic_entry(format))
+ list->nr_sort_keys++;
+
list_add_tail(&format->sort_list, &list->sorts);
}

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 480d2eb..d08e4f3 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -237,6 +237,7 @@ struct perf_hpp_fmt {
struct perf_hpp_list {
struct list_head fields;
struct list_head sorts;
+ int nr_sort_keys;
};

extern struct perf_hpp_list perf_hpp_list;