Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1351170 > unrolled thread

[PATCHv2] perf tools: Pass perf_hpp_list all the way through setup_sort_list

Started byJiri Olsa <jolsa@redhat.com>
First post2016-03-06 20:30 +0100
Last post2016-03-11 09:50 +0100
Articles 6 — 4 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCHv2] perf tools: Pass perf_hpp_list all the way through  setup_sort_list Jiri Olsa <jolsa@redhat.com> - 2016-03-06 20:30 +0100
    Re: [PATCHv2] perf tools: Pass perf_hpp_list all the way through  setup_sort_list Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-07 15:40 +0100
      [PATCHv3] perf tools: Pass perf_hpp_list all the way through  setup_sort_list Jiri Olsa <jolsa@redhat.com> - 2016-03-09 11:10 +0100
        Re: [PATCHv3] perf tools: Pass perf_hpp_list all the way through  setup_sort_list Namhyung Kim <namhyung@kernel.org> - 2016-03-09 13:50 +0100
          Re: [PATCHv3] perf tools: Pass perf_hpp_list all the way through  setup_sort_list Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-03-09 14:40 +0100
        [tip:perf/core] perf tools: Pass perf_hpp_list all the way through  setup_sort_list tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-03-11 09:50 +0100

#1351170 — [PATCHv2] perf tools: Pass perf_hpp_list all the way through setup_sort_list

FromJiri Olsa <jolsa@redhat.com>
Date2016-03-06 20:30 +0100
Subject[PATCHv2] perf tools: Pass perf_hpp_list all the way through setup_sort_list
Message-ID<r9Mxj-RI-1@gated-at.bofh.it>
On Mon, Jan 18, 2016 at 10:24:15AM +0100, Jiri Olsa wrote:
> Passing perf_hpp_list all the way through setup_sort_list
> so the sort entry could be added on the arbitrary list.
> 

looks like this one got forgotten..
rebased version attached

thanks,
jirka


---
Passing perf_hpp_list all the way through setup_sort_list
so the sort entry could be added on the arbitrary list.

Link: http://lkml.kernel.org/n/tip-1r0tlhwdfolal61gvciii07e@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/util/sort.c | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index ab6eb7ca8c60..e4dc58e26845 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1614,14 +1614,16 @@ 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 perf_hpp_list *list,
+					  struct sort_dimension *sd,
+					  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;
 }
 
@@ -2119,12 +2121,14 @@ out:
 	return ret;
 }
 
-static int __sort_dimension__add(struct sort_dimension *sd, int level)
+static int __sort_dimension__add(struct perf_hpp_list *list,
+				 struct sort_dimension *sd,
+				 int level)
 {
 	if (sd->taken)
 		return 0;
 
-	if (__sort_dimension__add_hpp_sort(sd, level) < 0)
+	if (__sort_dimension__add_hpp_sort(list, sd, level) < 0)
 		return -1;
 
 	if (sd->entry->se_collapse)
@@ -2135,7 +2139,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 perf_hpp_list *list,
+				struct hpp_dimension *hd,
+				int level)
 {
 	struct perf_hpp_fmt *fmt;
 
@@ -2147,7 +2153,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;
 }
 
@@ -2187,7 +2193,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;
@@ -2227,7 +2234,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(list, sd, level);
 	}
 
 	for (i = 0; i < ARRAY_SIZE(hpp_sort_dimensions); i++) {
@@ -2236,7 +2243,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(list, hd, level);
 	}
 
 	for (i = 0; i < ARRAY_SIZE(bstack_sort_dimensions); i++) {
@@ -2251,7 +2258,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(list, sd, level);
 		return 0;
 	}
 
@@ -2267,7 +2274,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(list, sd, level);
 		return 0;
 	}
 
@@ -2277,7 +2284,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;
@@ -2285,7 +2293,7 @@ static int setup_sort_list(char *str, struct perf_evlist *evlist)
 
 	for (tok = strtok_r(str, ", ", &tmp);
 			tok; tok = strtok_r(NULL, ", ", &tmp)) {
-		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;
@@ -2430,7 +2438,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;
@@ -2675,7 +2683,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;
 	}
-- 
2.4.3

[toc] | [next] | [standalone]

#1351635

FromArnaldo Carvalho de Melo <acme@kernel.org>
Date2016-03-07 15:40 +0100
Message-ID<ra4ue-42s-19@gated-at.bofh.it>
In reply to#1351170
Em Sun, Mar 06, 2016 at 08:21:52PM +0100, Jiri Olsa escreveu:
> On Mon, Jan 18, 2016 at 10:24:15AM +0100, Jiri Olsa wrote:
> > Passing perf_hpp_list all the way through setup_sort_list
> > so the sort entry could be added on the arbitrary list.
> > 
> 
> looks like this one got forgotten..
> rebased version attached
> 
> thanks,
> jirka
> 
> 
> ---
> Passing perf_hpp_list all the way through setup_sort_list
> so the sort entry could be added on the arbitrary list.
> 
> Link: http://lkml.kernel.org/n/tip-1r0tlhwdfolal61gvciii07e@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
>  tools/perf/util/sort.c | 38 +++++++++++++++++++++++---------------
>  1 file changed, 23 insertions(+), 15 deletions(-)
> 
> diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
> index ab6eb7ca8c60..e4dc58e26845 100644
> --- a/tools/perf/util/sort.c
> +++ b/tools/perf/util/sort.c
> @@ -1614,14 +1614,16 @@ 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 perf_hpp_list *list,
> +					  struct sort_dimension *sd,
> +					  int level)

If the function is named foo__bar(), then the convention is for the
first parameter to be a pointer to "foo", so, above, it would make:

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;
>  }
>  
> @@ -2119,12 +2121,14 @@ out:
>  	return ret;
>  }
>  
> -static int __sort_dimension__add(struct sort_dimension *sd, int level)
> +static int __sort_dimension__add(struct perf_hpp_list *list,
> +				 struct sort_dimension *sd,
> +				 int level)

ditto for here and the other cases below.

- Arnaldo

>  {
>  	if (sd->taken)
>  		return 0;
>  
> -	if (__sort_dimension__add_hpp_sort(sd, level) < 0)
> +	if (__sort_dimension__add_hpp_sort(list, sd, level) < 0)
>  		return -1;
>  
>  	if (sd->entry->se_collapse)
> @@ -2135,7 +2139,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 perf_hpp_list *list,
> +				struct hpp_dimension *hd,
> +				int level)
>  {
>  	struct perf_hpp_fmt *fmt;
>  
> @@ -2147,7 +2153,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;
>  }
>  
> @@ -2187,7 +2193,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;
> @@ -2227,7 +2234,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(list, sd, level);
>  	}
>  
>  	for (i = 0; i < ARRAY_SIZE(hpp_sort_dimensions); i++) {
> @@ -2236,7 +2243,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(list, hd, level);
>  	}
>  
>  	for (i = 0; i < ARRAY_SIZE(bstack_sort_dimensions); i++) {
> @@ -2251,7 +2258,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(list, sd, level);
>  		return 0;
>  	}
>  
> @@ -2267,7 +2274,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(list, sd, level);
>  		return 0;
>  	}
>  
> @@ -2277,7 +2284,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;
> @@ -2285,7 +2293,7 @@ static int setup_sort_list(char *str, struct perf_evlist *evlist)
>  
>  	for (tok = strtok_r(str, ", ", &tmp);
>  			tok; tok = strtok_r(NULL, ", ", &tmp)) {
> -		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;
> @@ -2430,7 +2438,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;
> @@ -2675,7 +2683,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;
>  	}
> -- 
> 2.4.3

[toc] | [prev] | [next] | [standalone]

#1353937 — [PATCHv3] perf tools: Pass perf_hpp_list all the way through setup_sort_list

FromJiri Olsa <jolsa@redhat.com>
Date2016-03-09 11:10 +0100
Subject[PATCHv3] perf tools: Pass perf_hpp_list all the way through setup_sort_list
Message-ID<raJe2-6mX-11@gated-at.bofh.it>
In reply to#1351635
On Mon, Mar 07, 2016 at 11:31:00AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Sun, Mar 06, 2016 at 08:21:52PM +0100, Jiri Olsa escreveu:
> > On Mon, Jan 18, 2016 at 10:24:15AM +0100, Jiri Olsa wrote:
> > > Passing perf_hpp_list all the way through setup_sort_list
> > > so the sort entry could be added on the arbitrary list.
> > > 
> > 
> > looks like this one got forgotten..
> > rebased version attached
> > 
> > thanks,
> > jirka
> > 
> > 
> > ---
> > Passing perf_hpp_list all the way through setup_sort_list
> > so the sort entry could be added on the arbitrary list.
> > 
> > Link: http://lkml.kernel.org/n/tip-1r0tlhwdfolal61gvciii07e@git.kernel.org
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> >  tools/perf/util/sort.c | 38 +++++++++++++++++++++++---------------
> >  1 file changed, 23 insertions(+), 15 deletions(-)
> > 
> > diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
> > index ab6eb7ca8c60..e4dc58e26845 100644
> > --- a/tools/perf/util/sort.c
> > +++ b/tools/perf/util/sort.c
> > @@ -1614,14 +1614,16 @@ 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 perf_hpp_list *list,
> > +					  struct sort_dimension *sd,
> > +					  int level)
> 
> If the function is named foo__bar(), then the convention is for the
> first parameter to be a pointer to "foo", so, above, it would make:
> 
> static int __sort_dimension__add_hpp_sort(struct sort_dimension *sd,
> 					  struct perf_hpp_list *list,
> 					  int level)

right, v3 attached

thanks,
jirka


---
Passing perf_hpp_list all the way through setup_sort_list
so the sort entry could be added on the arbitrary list.

Link: http://lkml.kernel.org/n/tip-1r0tlhwdfolal61gvciii07e@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 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 041f236379e0..59a101e43457 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;
 	}
-- 
2.4.3

[toc] | [prev] | [next] | [standalone]

#1354088 — Re: [PATCHv3] perf tools: Pass perf_hpp_list all the way through setup_sort_list

FromNamhyung Kim <namhyung@kernel.org>
Date2016-03-09 13:50 +0100
SubjectRe: [PATCHv3] perf tools: Pass perf_hpp_list all the way through setup_sort_list
Message-ID<raLIR-7XZ-9@gated-at.bofh.it>
In reply to#1353937
On Wed, Mar 09, 2016 at 11:04:17AM +0100, Jiri Olsa wrote:
> On Mon, Mar 07, 2016 at 11:31:00AM -0300, Arnaldo Carvalho de Melo wrote:
> > Em Sun, Mar 06, 2016 at 08:21:52PM +0100, Jiri Olsa escreveu:
> > > --- a/tools/perf/util/sort.c
> > > +++ b/tools/perf/util/sort.c
> > > @@ -1614,14 +1614,16 @@ 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 perf_hpp_list *list,
> > > +					  struct sort_dimension *sd,
> > > +					  int level)
> > 
> > If the function is named foo__bar(), then the convention is for the
> > first parameter to be a pointer to "foo", so, above, it would make:
> > 
> > static int __sort_dimension__add_hpp_sort(struct sort_dimension *sd,
> > 					  struct perf_hpp_list *list,
> > 					  int level)
> 
> right, v3 attached
> 
> thanks,
> jirka
> 
> 
> ---
> Passing perf_hpp_list all the way through setup_sort_list
> so the sort entry could be added on the arbitrary list.
> 
> Link: http://lkml.kernel.org/n/tip-1r0tlhwdfolal61gvciii07e@git.kernel.org
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung


> ---
>  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 041f236379e0..59a101e43457 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;
>  	}
> -- 
> 2.4.3
>

[toc] | [prev] | [next] | [standalone]

#1354122 — Re: [PATCHv3] perf tools: Pass perf_hpp_list all the way through setup_sort_list

FromArnaldo Carvalho de Melo <acme@kernel.org>
Date2016-03-09 14:40 +0100
SubjectRe: [PATCHv3] perf tools: Pass perf_hpp_list all the way through setup_sort_list
Message-ID<raMvg-5O-15@gated-at.bofh.it>
In reply to#1354088
Em Wed, Mar 09, 2016 at 09:47:51PM +0900, Namhyung Kim escreveu:
> On Wed, Mar 09, 2016 at 11:04:17AM +0100, Jiri Olsa wrote:
> > Passing perf_hpp_list all the way through setup_sort_list
> > so the sort entry could be added on the arbitrary list.
> 
> Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks, applied,

- Arnaldo

[toc] | [prev] | [next] | [standalone]

#1355702 — [tip:perf/core] perf tools: Pass perf_hpp_list all the way through setup_sort_list

Fromtip-bot for Jiri Olsa <tipbot@zytor.com>
Date2016-03-11 09:50 +0100
Subject[tip:perf/core] perf tools: Pass perf_hpp_list all the way through setup_sort_list
Message-ID<rbqVJ-3vt-27@gated-at.bofh.it>
In reply to#1353937
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;
 	}

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web