From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com,
mingo@kernel.org, a.p.zijlstra@chello.nl, namhyung@kernel.org,
tglx@linutronix.de, jolsa@kernel.org, hpa@zytor.com,
jolsa@redhat.com
Subject: [tip:perf/core] perf tools: Pass perf_hpp_list all the way through setup_sort_list
Date: Fri, 11 Mar 2016 00:46:28 -0800 [thread overview]
Message-ID: <tip-d7b617f51be4fffa3cbb5adf6d4258e616dce294@git.kernel.org> (raw)
In-Reply-To: <20160309100417.GA30910@krava.redhat.com>
Commit-ID: d7b617f51be4fffa3cbb5adf6d4258e616dce294
Gitweb: http://git.kernel.org/tip/d7b617f51be4fffa3cbb5adf6d4258e616dce294
Author: Jiri Olsa <jolsa@redhat.com>
AuthorDate: Wed, 9 Mar 2016 11:04:17 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 9 Mar 2016 10:37:26 -0300
perf tools: Pass perf_hpp_list all the way through setup_sort_list
Pass perf_hpp_list all the way through setup_sort_list so that the sort
entry can be added on the arbitrary list.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20160309100417.GA30910@krava.redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/sort.c | 44 ++++++++++++++++++++++++++------------------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 041f236..59a101e 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1614,19 +1614,21 @@ int hist_entry__filter(struct hist_entry *he, int type, const void *arg)
return hse->se->se_filter(he, type, arg);
}
-static int __sort_dimension__add_hpp_sort(struct sort_dimension *sd, int level)
+static int __sort_dimension__add_hpp_sort(struct sort_dimension *sd,
+ struct perf_hpp_list *list,
+ int level)
{
struct hpp_sort_entry *hse = __sort_dimension__alloc_hpp(sd, level);
if (hse == NULL)
return -1;
- perf_hpp__register_sort_field(&hse->hpp);
+ perf_hpp_list__register_sort_field(list, &hse->hpp);
return 0;
}
-static int __sort_dimension__add_hpp_output(struct perf_hpp_list *list,
- struct sort_dimension *sd)
+static int __sort_dimension__add_hpp_output(struct sort_dimension *sd,
+ struct perf_hpp_list *list)
{
struct hpp_sort_entry *hse = __sort_dimension__alloc_hpp(sd, 0);
@@ -2147,12 +2149,14 @@ out:
return ret;
}
-static int __sort_dimension__add(struct sort_dimension *sd, int level)
+static int __sort_dimension__add(struct sort_dimension *sd,
+ struct perf_hpp_list *list,
+ int level)
{
if (sd->taken)
return 0;
- if (__sort_dimension__add_hpp_sort(sd, level) < 0)
+ if (__sort_dimension__add_hpp_sort(sd, list, level) < 0)
return -1;
if (sd->entry->se_collapse)
@@ -2163,7 +2167,9 @@ static int __sort_dimension__add(struct sort_dimension *sd, int level)
return 0;
}
-static int __hpp_dimension__add(struct hpp_dimension *hd, int level)
+static int __hpp_dimension__add(struct hpp_dimension *hd,
+ struct perf_hpp_list *list,
+ int level)
{
struct perf_hpp_fmt *fmt;
@@ -2175,7 +2181,7 @@ static int __hpp_dimension__add(struct hpp_dimension *hd, int level)
return -1;
hd->taken = 1;
- perf_hpp__register_sort_field(fmt);
+ perf_hpp_list__register_sort_field(list, fmt);
return 0;
}
@@ -2185,7 +2191,7 @@ static int __sort_dimension__add_output(struct perf_hpp_list *list,
if (sd->taken)
return 0;
- if (__sort_dimension__add_hpp_output(list, sd) < 0)
+ if (__sort_dimension__add_hpp_output(sd, list) < 0)
return -1;
sd->taken = 1;
@@ -2215,7 +2221,8 @@ int hpp_dimension__add_output(unsigned col)
return __hpp_dimension__add_output(&perf_hpp_list, &hpp_sort_dimensions[col]);
}
-static int sort_dimension__add(const char *tok, struct perf_evlist *evlist,
+static int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
+ struct perf_evlist *evlist __maybe_unused,
int level)
{
unsigned int i;
@@ -2255,7 +2262,7 @@ static int sort_dimension__add(const char *tok, struct perf_evlist *evlist,
sort__has_thread = 1;
}
- return __sort_dimension__add(sd, level);
+ return __sort_dimension__add(sd, list, level);
}
for (i = 0; i < ARRAY_SIZE(hpp_sort_dimensions); i++) {
@@ -2264,7 +2271,7 @@ static int sort_dimension__add(const char *tok, struct perf_evlist *evlist,
if (strncasecmp(tok, hd->name, strlen(tok)))
continue;
- return __hpp_dimension__add(hd, level);
+ return __hpp_dimension__add(hd, list, level);
}
for (i = 0; i < ARRAY_SIZE(bstack_sort_dimensions); i++) {
@@ -2279,7 +2286,7 @@ static int sort_dimension__add(const char *tok, struct perf_evlist *evlist,
if (sd->entry == &sort_sym_from || sd->entry == &sort_sym_to)
sort__has_sym = 1;
- __sort_dimension__add(sd, level);
+ __sort_dimension__add(sd, list, level);
return 0;
}
@@ -2295,7 +2302,7 @@ static int sort_dimension__add(const char *tok, struct perf_evlist *evlist,
if (sd->entry == &sort_mem_daddr_sym)
sort__has_sym = 1;
- __sort_dimension__add(sd, level);
+ __sort_dimension__add(sd, list, level);
return 0;
}
@@ -2305,7 +2312,8 @@ static int sort_dimension__add(const char *tok, struct perf_evlist *evlist,
return -ESRCH;
}
-static int setup_sort_list(char *str, struct perf_evlist *evlist)
+static int setup_sort_list(struct perf_hpp_list *list, char *str,
+ struct perf_evlist *evlist)
{
char *tmp, *tok;
int ret = 0;
@@ -2332,7 +2340,7 @@ static int setup_sort_list(char *str, struct perf_evlist *evlist)
}
if (*tok) {
- ret = sort_dimension__add(tok, evlist, level);
+ ret = sort_dimension__add(list, tok, evlist, level);
if (ret == -EINVAL) {
error("Invalid --sort key: `%s'", tok);
break;
@@ -2480,7 +2488,7 @@ static int __setup_sorting(struct perf_evlist *evlist)
}
}
- ret = setup_sort_list(str, evlist);
+ ret = setup_sort_list(&perf_hpp_list, str, evlist);
free(str);
return ret;
@@ -2725,7 +2733,7 @@ int setup_sorting(struct perf_evlist *evlist)
return err;
if (parent_pattern != default_parent_pattern) {
- err = sort_dimension__add("parent", evlist, -1);
+ err = sort_dimension__add(&perf_hpp_list, "parent", evlist, -1);
if (err < 0)
return err;
}
next prev parent reply other threads:[~2016-03-11 8:46 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 ` [PATCH 05/26] perf tools: Add equal method to perf_hpp_fmt struct Jiri Olsa
2016-02-04 12:34 ` [tip:perf/core] perf hists: Add 'equal' " 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-bot for Jiri Olsa [this message]
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=tip-d7b617f51be4fffa3cbb5adf6d4258e616dce294@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tglx@linutronix.de \
/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).