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/[email protected] > Signed-off-by: Jiri Olsa <[email protected]>
Acked-by: Namhyung Kim <[email protected]> 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 >
