perf tools: Add ->cmp(), ->collapse() and ->sort() to perf_hpp_fmt

Those function pointers will be used to sort report output based on
the selected fields.  This is a preparation of later change.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Ingo Molnar <mingo@kernel.org>
Link: http://lkml.kernel.org/r/1400480762-22852-2-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 0912805c08f4d1ec4913a57d66eec7e4379891fb..d4a4f2e7eb430e64b765e00156b9420be8a7ada7 100644 (file)
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -192,6 +192,14 @@ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt __maybe_unused,            \
                          hpp_entry_scnprintf, true);                           \
 }
 
+#define __HPP_SORT_FN(_type, _field)                                           \
+static int64_t hpp__sort_##_type(struct hist_entry *a, struct hist_entry *b)   \
+{                                                                              \
+       s64 __a = he_get_##_field(a);                                           \
+       s64 __b = he_get_##_field(b);                                           \
+       return __a - __b;                                                       \
+}
+
 #define __HPP_ENTRY_RAW_FN(_type, _field)                                      \
 static u64 he_get_raw_##_field(struct hist_entry *he)                          \
 {                                                                              \
@@ -206,16 +214,27 @@ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt __maybe_unused,           \
                          hpp_entry_scnprintf, false);                          \
 }
 
+#define __HPP_SORT_RAW_FN(_type, _field)                                       \
+static int64_t hpp__sort_##_type(struct hist_entry *a, struct hist_entry *b)   \
+{                                                                              \
+       s64 __a = he_get_raw_##_field(a);                                       \
+       s64 __b = he_get_raw_##_field(b);                                       \
+       return __a - __b;                                                       \
+}
+
+
 #define HPP_PERCENT_FNS(_type, _str, _field, _min_width, _unit_width)  \
 __HPP_HEADER_FN(_type, _str, _min_width, _unit_width)                  \
 __HPP_WIDTH_FN(_type, _min_width, _unit_width)                         \
 __HPP_COLOR_PERCENT_FN(_type, _field)                                  \
-__HPP_ENTRY_PERCENT_FN(_type, _field)
+__HPP_ENTRY_PERCENT_FN(_type, _field)                                  \
+__HPP_SORT_FN(_type, _field)
 
 #define HPP_RAW_FNS(_type, _str, _field, _min_width, _unit_width)      \
 __HPP_HEADER_FN(_type, _str, _min_width, _unit_width)                  \
 __HPP_WIDTH_FN(_type, _min_width, _unit_width)                         \
-__HPP_ENTRY_RAW_FN(_type, _field)
+__HPP_ENTRY_RAW_FN(_type, _field)                                      \
+__HPP_SORT_RAW_FN(_type, _field)
 
 
 HPP_PERCENT_FNS(overhead, "Overhead", period, 8, 8)
@@ -227,19 +246,31 @@ HPP_PERCENT_FNS(overhead_guest_us, "guest usr", period_guest_us, 9, 8)
 HPP_RAW_FNS(samples, "Samples", nr_events, 12, 12)
 HPP_RAW_FNS(period, "Period", period, 12, 12)
 
+static int64_t hpp__nop_cmp(struct hist_entry *a __maybe_unused,
+                           struct hist_entry *b __maybe_unused)
+{
+       return 0;
+}
+
 #define HPP__COLOR_PRINT_FNS(_name)                    \
        {                                               \
                .header = hpp__header_ ## _name,        \
                .width  = hpp__width_ ## _name,         \
                .color  = hpp__color_ ## _name,         \
-               .entry  = hpp__entry_ ## _name          \
+               .entry  = hpp__entry_ ## _name,         \
+               .cmp    = hpp__nop_cmp,                 \
+               .collapse = hpp__nop_cmp,               \
+               .sort   = hpp__sort_ ## _name,          \
        }
 
 #define HPP__PRINT_FNS(_name)                          \
        {                                               \
                .header = hpp__header_ ## _name,        \
                .width  = hpp__width_ ## _name,         \
-               .entry  = hpp__entry_ ## _name          \
+               .entry  = hpp__entry_ ## _name,         \
+               .cmp    = hpp__nop_cmp,                 \
+               .collapse = hpp__nop_cmp,               \
+               .sort   = hpp__sort_ ## _name,          \
        }
 
 struct perf_hpp_fmt perf_hpp__format[] = {

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 38c3e874c164a788216d00198169f0702983eac4..36dbe00e3cc8b2136dbea96e934a44f021abf100 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -160,6 +160,9 @@ struct perf_hpp_fmt {
                     struct hist_entry *he);
        int (*entry)(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
                     struct hist_entry *he);
+       int64_t (*cmp)(struct hist_entry *a, struct hist_entry *b);
+       int64_t (*collapse)(struct hist_entry *a, struct hist_entry *b);
+       int64_t (*sort)(struct hist_entry *a, struct hist_entry *b);
 
        struct list_head list;
 };