perf hists: Introduce perf_hpp_list__for_each_sort_list macro

Introducing perf_hpp_list__for_each_sort_list macro to iterate
perf_hpp_list object's sort entries.

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-22-git-send-email-jolsa@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 348706a..f09eabe 100644 (file)
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -553,7 +553,7 @@ void perf_hpp__setup_output_field(void)
        struct perf_hpp_fmt *fmt;
 
        /* append sort keys to output field */
-       perf_hpp__for_each_sort_list(fmt) {
+       perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) {
                struct perf_hpp_fmt *pos;
 
                perf_hpp_list__for_each_format(&perf_hpp_list, pos) {
@@ -575,7 +575,7 @@ void perf_hpp__append_sort_keys(void)
        perf_hpp_list__for_each_format(&perf_hpp_list, fmt) {
                struct perf_hpp_fmt *pos;
 
-               perf_hpp__for_each_sort_list(pos) {
+               perf_hpp_list__for_each_sort_list(&perf_hpp_list, pos) {
                        if (fmt_equal(fmt, pos))
                                goto next;
                }

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index b762ecc..dea475d 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -961,7 +961,7 @@ hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)
        struct perf_hpp_fmt *fmt;
        int64_t cmp = 0;
 
-       perf_hpp__for_each_sort_list(fmt) {
+       perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) {
                cmp = fmt->cmp(fmt, left, right);
                if (cmp)
                        break;
@@ -976,7 +976,7 @@ hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)
        struct perf_hpp_fmt *fmt;
        int64_t cmp = 0;
 
-       perf_hpp__for_each_sort_list(fmt) {
+       perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) {
                cmp = fmt->collapse(fmt, left, right);
                if (cmp)
                        break;
@@ -1120,7 +1120,7 @@ static int hist_entry__sort(struct hist_entry *a, struct hist_entry *b)
        struct perf_hpp_fmt *fmt;
        int64_t cmp = 0;
 
-       perf_hpp__for_each_sort_list(fmt) {
+       perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) {
                if (perf_hpp__should_skip(fmt, a->hists))
                        continue;
 

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index f5b2309..c9b2ea4 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -254,8 +254,8 @@ static inline void perf_hpp__register_sort_field(struct perf_hpp_fmt *format)
 #define perf_hpp_list__for_each_format_safe(_list, format, tmp)        \
        list_for_each_entry_safe(format, tmp, &(_list)->fields, list)
 
-#define perf_hpp__for_each_sort_list(format) \
-       list_for_each_entry(format, &perf_hpp_list.sorts, sort_list)
+#define perf_hpp_list__for_each_sort_list(_list, format) \
+       list_for_each_entry(format, &(_list)->sorts, sort_list)
 
 #define perf_hpp__for_each_sort_list_safe(format, tmp) \
        list_for_each_entry_safe(format, tmp, &perf_hpp_list.sorts, sort_list)