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

[Arnaldo Carvalho de Melo <acme@kernel.org>]

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