From: Jiri Olsa <jolsa@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
Jiri Olsa <jolsa@kernel.org>
Subject: [PATCH 01/22] perf tools: Add ->cmp(), ->collapse() and ->sort() to perf_hpp_fmt
Date: Wed, 21 May 2014 15:12:23 +0200 [thread overview]
Message-ID: <1400677964-25160-2-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1400677964-25160-1-git-send-email-jolsa@kernel.org>
From: Namhyung Kim <namhyung@kernel.org>
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>
---
tools/perf/ui/hist.c | 39 +++++++++++++++++++++++++++++++++++----
tools/perf/util/hist.h | 3 +++
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 0912805..d4a4f2e 100644
--- 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 38c3e87..36dbe00 100644
--- 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;
};
--
1.8.3.1
next prev parent reply other threads:[~2014-05-21 13:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-21 13:12 [GIT PULL 00/22] perf/core improvements and fixes Jiri Olsa
2014-05-21 13:12 ` Jiri Olsa [this message]
2014-05-21 13:12 ` [PATCH 02/22] perf tools: Convert sort entries to hpp formats Jiri Olsa
2014-05-21 13:12 ` [PATCH 03/22] perf tools: Use hpp formats to sort hist entries Jiri Olsa
2014-05-21 13:12 ` [PATCH 04/22] perf tools: Support event grouping in hpp ->sort() Jiri Olsa
2014-05-21 13:12 ` [PATCH 05/22] perf tools: Use hpp formats to sort final output Jiri Olsa
2014-05-21 13:12 ` [PATCH 06/22] perf tools: Consolidate output field handling to hpp format routines Jiri Olsa
2014-05-21 13:12 ` [PATCH 07/22] perf ui: Get rid of callback from __hpp__fmt() Jiri Olsa
2014-05-21 13:12 ` [PATCH 08/22] perf tools: Allow hpp fields to be sort keys Jiri Olsa
2014-05-21 13:12 ` [PATCH 09/22] perf tools: Consolidate management of default sort orders Jiri Olsa
2014-05-21 13:12 ` [PATCH 10/22] perf tools: Call perf_hpp__init() before setting up GUI browsers Jiri Olsa
2014-05-21 13:12 ` [PATCH 11/22] perf report: Add -F option to specify output fields Jiri Olsa
2014-05-21 13:12 ` [PATCH 12/22] perf tools: Add ->sort() member to struct sort_entry Jiri Olsa
2014-05-21 13:12 ` [PATCH 13/22] perf report/tui: Fix a bug when --fields/sort is given Jiri Olsa
2014-05-21 13:12 ` [PATCH 14/22] perf top: Add --fields option to specify output fields Jiri Olsa
2014-05-21 13:12 ` [PATCH 15/22] perf tools: Skip elided sort entries Jiri Olsa
2014-05-21 13:12 ` [PATCH 16/22] perf hists: Reset width of output fields with header length Jiri Olsa
2014-05-21 13:12 ` [PATCH 17/22] perf tools: Get rid of obsolete hist_entry__sort_list Jiri Olsa
2014-05-21 13:12 ` [PATCH 18/22] perf tools: Introduce reset_output_field() Jiri Olsa
2014-05-21 13:12 ` [PATCH 19/22] perf tests: Factor out print_hists_*() Jiri Olsa
2014-05-21 13:12 ` [PATCH 20/22] perf tests: Add a testcase for histogram output sorting Jiri Olsa
2014-05-21 13:12 ` [PATCH 21/22] perf tools: Add cat as fallback pager Jiri Olsa
2014-05-21 13:12 ` [PATCH 22/22] perf tools: Add automatic remapping of Android libraries Jiri Olsa
2014-05-22 9:38 ` [GIT PULL 00/22] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400677964-25160-2-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).