]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
perf hists: Make hpp setup function generic
authorJiri Olsa <jolsa@kernel.org>
Mon, 18 Jan 2016 09:24:05 +0000 (10:24 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 3 Feb 2016 15:24:02 +0000 (12:24 -0300)
Now that we have the 'equal' method implemented for hpp format entries
we can ease up the logic in the following functions and make them
generic wrt comparing format entries:

  perf_hpp__setup_output_field
  perf_hpp__append_sort_keys

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1453109064-1026-8-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/ui/hist.c

index b543f4b7d7d36fec758c09a6ae06003d538dd551..b0fcaecb7d1dedc49775e5b72c6eb8f8cec754c6 100644 (file)
@@ -551,21 +551,11 @@ void perf_hpp__setup_output_field(void)
 
        /* append sort keys to output field */
        perf_hpp__for_each_sort_list(fmt) {
-               if (!list_empty(&fmt->list))
-                       continue;
+               struct perf_hpp_fmt *pos;
 
-               /*
-                * sort entry fields are dynamically created,
-                * so they can share a same sort key even though
-                * the list is empty.
-                */
-               if (perf_hpp__is_sort_entry(fmt)) {
-                       struct perf_hpp_fmt *pos;
-
-                       perf_hpp__for_each_format(pos) {
-                               if (fmt_equal(fmt, pos))
-                                       goto next;
-                       }
+               perf_hpp__for_each_format(pos) {
+                       if (fmt_equal(fmt, pos))
+                               goto next;
                }
 
                perf_hpp__column_register(fmt);
@@ -580,21 +570,11 @@ void perf_hpp__append_sort_keys(void)
 
        /* append output fields to sort keys */
        perf_hpp__for_each_format(fmt) {
-               if (!list_empty(&fmt->sort_list))
-                       continue;
+               struct perf_hpp_fmt *pos;
 
-               /*
-                * sort entry fields are dynamically created,
-                * so they can share a same sort key even though
-                * the list is empty.
-                */
-               if (perf_hpp__is_sort_entry(fmt)) {
-                       struct perf_hpp_fmt *pos;
-
-                       perf_hpp__for_each_sort_list(pos) {
-                               if (fmt_equal(fmt, pos))
-                                       goto next;
-                       }
+               perf_hpp__for_each_sort_list(pos) {
+                       if (fmt_equal(fmt, pos))
+                               goto next;
                }
 
                perf_hpp__register_sort_field(fmt);