perf tools: Remove nr_sort_keys field

The nr_sort_keys field is to carry the number of sort entries in a
hpp_list or hists to determine the depth of indentation of a hist entry.
As it's only used in hierarchy mode and now we have used nr_hpp_node for
this reason, there's no need to keep it anymore.  Let's get rid of it.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Tested-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1457531222-18130-7-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index f03c4f70438fb90daf720164edf65d5a680f2d30..3baeaa6e71b5a51e113b8b485df97b7c8ae003a2 100644 (file)
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -515,9 +515,6 @@ 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 6870a1bfd762fbfe63483dff86bf0fb025972ae6..ead18c82294faf881f1d4bc89be653e27ff5c708 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -79,7 +79,6 @@ struct hists {
        int                     socket_filter;
        struct perf_hpp_list    *hpp_list;
        struct list_head        hpp_formats;
-       int                     nr_sort_keys;
        int                     nr_hpp_node;
 };
 
@@ -241,7 +240,6 @@ 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;

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 61c74022e47fe4f8b2b77ae923b890cefc437136..ced849e51e6ba5b6b7301b8f133ece3bac8c209a 100644 (file)
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2703,29 +2703,6 @@ out:
        return ret;
 }
 
-static void evlist__set_hists_nr_sort_keys(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel;
-
-       evlist__for_each(evlist, evsel) {
-               struct perf_hpp_fmt *fmt;
-               struct hists *hists = evsel__hists(evsel);
-
-               hists->nr_sort_keys = perf_hpp_list.nr_sort_keys;
-
-               /*
-                * If dynamic entries were used, it might add multiple
-                * entries to each evsel for a single field name.  Set
-                * actual number of sort keys for each hists.
-                */
-               perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) {
-                       if (perf_hpp__is_dynamic_entry(fmt) &&
-                           !perf_hpp__defined_dynamic_entry(fmt, hists))
-                               hists->nr_sort_keys--;
-               }
-       }
-}
-
 int setup_sorting(struct perf_evlist *evlist)
 {
        int err;
@@ -2740,9 +2717,6 @@ int setup_sorting(struct perf_evlist *evlist)
                        return err;
        }
 
-       if (evlist != NULL)
-               evlist__set_hists_nr_sort_keys(evlist);
-
        reset_dimensions();
 
        /*