From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 05/26] perf tools: Add equal method to perf_hpp_fmt struct
Date: Mon, 18 Jan 2016 10:24:03 +0100 [thread overview]
Message-ID: <1453109064-1026-6-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1453109064-1026-1-git-send-email-jolsa@kernel.org>
To easily compare format entries and make it available
for all kinds of format entries.
Link: http://lkml.kernel.org/n/tip-6ncdmurfcmyk4sfy7fr4bkr1@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/ui/hist.c | 9 +++++++--
tools/perf/util/hist.h | 2 +-
tools/perf/util/sort.c | 39 ++++++++++++++++++++-------------------
3 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 5a11bf0aabc7..71c8bb71a350 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -524,6 +524,11 @@ void perf_hpp__cancel_cumulate(void)
perf_hpp__format[PERF_HPP__OVERHEAD].name = "Overhead";
}
+static bool fmt_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)
+{
+ return a->equal && a->equal(a, b);
+}
+
void perf_hpp__setup_output_field(void)
{
struct perf_hpp_fmt *fmt;
@@ -542,7 +547,7 @@ void perf_hpp__setup_output_field(void)
struct perf_hpp_fmt *pos;
perf_hpp__for_each_format(pos) {
- if (perf_hpp__same_sort_entry(pos, fmt))
+ if (fmt_equal(fmt, pos))
goto next;
}
}
@@ -571,7 +576,7 @@ void perf_hpp__append_sort_keys(void)
struct perf_hpp_fmt *pos;
perf_hpp__for_each_sort_list(pos) {
- if (perf_hpp__same_sort_entry(pos, fmt))
+ if (fmt_equal(fmt, pos))
goto next;
}
}
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 8a0cbdeb449e..9a240d7b8d3b 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -215,6 +215,7 @@ struct perf_hpp_fmt {
struct hist_entry *a, struct hist_entry *b);
int64_t (*sort)(struct perf_hpp_fmt *fmt,
struct hist_entry *a, struct hist_entry *b);
+ bool (*equal)(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b);
struct list_head list;
struct list_head sort_list;
@@ -268,7 +269,6 @@ void perf_hpp__reset_output_field(void);
void perf_hpp__append_sort_keys(void);
bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format);
-bool perf_hpp__same_sort_entry(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b);
bool perf_hpp__is_dynamic_entry(struct perf_hpp_fmt *format);
bool perf_hpp__defined_dynamic_entry(struct perf_hpp_fmt *fmt, struct hists *hists);
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index ec722346e6ff..1b57ec9d7c2f 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1440,20 +1440,6 @@ struct hpp_sort_entry {
struct sort_entry *se;
};
-bool perf_hpp__same_sort_entry(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)
-{
- struct hpp_sort_entry *hse_a;
- struct hpp_sort_entry *hse_b;
-
- if (!perf_hpp__is_sort_entry(a) || !perf_hpp__is_sort_entry(b))
- return false;
-
- hse_a = container_of(a, struct hpp_sort_entry, hpp);
- hse_b = container_of(b, struct hpp_sort_entry, hpp);
-
- return hse_a->se == hse_b->se;
-}
-
void perf_hpp__reset_sort_width(struct perf_hpp_fmt *fmt, struct hists *hists)
{
struct hpp_sort_entry *hse;
@@ -1539,6 +1525,25 @@ static int64_t __sort__hpp_sort(struct perf_hpp_fmt *fmt,
return sort_fn(a, b);
}
+bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format)
+{
+ return format->header == __sort__hpp_header;
+}
+
+static bool __sort__hpp_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)
+{
+ struct hpp_sort_entry *hse_a;
+ struct hpp_sort_entry *hse_b;
+
+ if (!perf_hpp__is_sort_entry(a) || !perf_hpp__is_sort_entry(b))
+ return false;
+
+ hse_a = container_of(a, struct hpp_sort_entry, hpp);
+ hse_b = container_of(b, struct hpp_sort_entry, hpp);
+
+ return hse_a->se == hse_b->se;
+}
+
static struct hpp_sort_entry *
__sort_dimension__alloc_hpp(struct sort_dimension *sd)
{
@@ -1560,6 +1565,7 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd)
hse->hpp.cmp = __sort__hpp_cmp;
hse->hpp.collapse = __sort__hpp_collapse;
hse->hpp.sort = __sort__hpp_sort;
+ hse->hpp.equal = __sort__hpp_equal;
INIT_LIST_HEAD(&hse->hpp.list);
INIT_LIST_HEAD(&hse->hpp.sort_list);
@@ -1570,11 +1576,6 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd)
return hse;
}
-bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format)
-{
- return format->header == __sort__hpp_header;
-}
-
static int __sort_dimension__add_hpp_sort(struct sort_dimension *sd)
{
struct hpp_sort_entry *hse = __sort_dimension__alloc_hpp(sd);
--
2.4.3
next prev parent reply other threads:[~2016-01-18 9:30 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-18 9:23 [RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa
2016-01-18 9:23 ` [PATCH 01/26] perf tools: Factor output_resort from hists__output_resort Jiri Olsa
2016-02-04 12:33 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 02/26] perf tools: Introduce perf_evsel__output_resort function Jiri Olsa
2016-02-04 12:33 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 03/26] perf tools: Add _idx fields into struct perf_hpp_fmt Jiri Olsa
2016-02-04 12:34 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 04/26] perf tools: Use struct perf_hpp_fmt::idx in perf_hpp__reset_width Jiri Olsa
2016-02-04 12:34 ` [tip:perf/core] perf hists: Use struct perf_hpp_fmt:: idx " tip-bot for Jiri Olsa
2016-01-18 9:24 ` Jiri Olsa [this message]
2016-02-04 12:34 ` [tip:perf/core] perf hists: Add 'equal' method to perf_hpp_fmt struct tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 06/26] perf tools: Add hpp__equal callback function Jiri Olsa
2016-02-04 12:35 ` [tip:perf/core] perf hists: Add 'hpp__equal' " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 07/26] perf tools: Make hpp setup function generic Jiri Olsa
2016-02-04 12:35 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 08/26] perf report: Move ui initialization ahead of sort setup Jiri Olsa
2016-02-04 12:35 ` [tip:perf/core] perf report: Move UI " tip-bot for Jiri Olsa
2016-02-04 12:36 ` [tip:perf/core] perf top: " tip-bot for Arnaldo Carvalho de Melo
2016-01-18 9:24 ` [PATCH 09/26] perf tools: Allocate output sort field Jiri Olsa
2016-02-04 12:36 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 10/26] perf tools: Remove perf_hpp__column_(disable|enable) Jiri Olsa
2016-02-04 12:36 ` [tip:perf/core] perf hists: Remove perf_hpp__column_( disable|enable) tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 11/26] perf tools: Properly release format fields Jiri Olsa
2016-02-04 12:37 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 12/26] perf tools: Separate sort fields parsing into setup_sort_list function Jiri Olsa
2016-02-04 12:37 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 13/26] perf tools: Separate output fields parsing into setup_output_list function Jiri Olsa
2016-02-04 12:37 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 14/26] perf tools: Introduce struct perf_hpp_list Jiri Olsa
2016-01-25 15:00 ` Namhyung Kim
2016-01-25 15:09 ` Jiri Olsa
2016-02-02 21:19 ` Arnaldo Carvalho de Melo
2016-02-04 12:38 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 15/26] perf tools: Introduce perf_hpp_list__init function Jiri Olsa
2016-02-04 12:38 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 16/26] perf tools: Add perf_hpp_list register helpers Jiri Olsa
2016-02-04 12:38 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 17/26] perf tools: Pass perf_hpp_list all the way through setup_sort_list Jiri Olsa
2016-03-06 19:21 ` [PATCHv2] " Jiri Olsa
2016-03-07 14:31 ` Arnaldo Carvalho de Melo
2016-03-09 10:04 ` [PATCHv3] " Jiri Olsa
2016-03-09 12:47 ` Namhyung Kim
2016-03-09 13:38 ` Arnaldo Carvalho de Melo
2016-03-11 8:46 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 18/26] perf tools: Pass perf_hpp_list all the way through setup_output_list Jiri Olsa
2016-02-04 12:39 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 19/26] perf tools: Introduce perf_hpp_list__for_each_format macro Jiri Olsa
2016-02-04 12:39 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 20/26] perf tools: Introduce perf_hpp_list__for_each_format_safe macro Jiri Olsa
2016-02-04 12:40 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 21/26] perf tools: Introduce perf_hpp_list__for_each_sort_list macro Jiri Olsa
2016-02-04 12:40 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 22/26] perf tools: Introduce perf_hpp_list__for_each_sort_list_safe macro Jiri Olsa
2016-02-04 12:40 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 23/26] perf tools: Add struct perf_hpp_list argument to helper functions Jiri Olsa
2016-02-04 12:41 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 24/26] perf tools: Add hpp_list into struct hists object Jiri Olsa
2016-02-04 12:41 ` [tip:perf/core] " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 25/26] perf tools: Introduce hists__for_each_format macro Jiri Olsa
2016-02-04 12:41 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-18 9:24 ` [PATCH 26/26] perf tools: Introduce hists__for_each_sort_list macro Jiri Olsa
2016-02-04 12:42 ` [tip:perf/core] perf hists: " tip-bot for Jiri Olsa
2016-01-19 12:58 ` [RFC 00/26] perf tools: Introduce hists specific format entries Namhyung Kim
2016-01-19 13:23 ` Jiri Olsa
2016-01-25 7:15 ` Jiri Olsa
2016-01-25 14:24 ` Namhyung Kim
2016-01-25 14:37 ` Jiri Olsa
2016-02-02 22:22 ` Arnaldo Carvalho de Melo
2016-02-02 22:25 ` Arnaldo Carvalho de Melo
2016-02-02 22:42 ` Arnaldo Carvalho de Melo
2016-02-03 7:58 ` Jiri Olsa
2016-02-03 11:02 ` Jiri Olsa
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=1453109064-1026-6-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--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).