On Sun, Jul 12, 2020 at 6:27 AM Jiri Olsa <jo...@kernel.org> wrote:
>
> Following the previous change that rename egroup
> to metric, there's no reason to call the list
> 'group_list' anymore, renaming it to list.
List doesn't seem to be adding information beyond the data type. I
would prefer something like metric_list as it gives a clue what's in
the list. It's a shame we can't have templated lists, if we did then
my data type argument would apply and so maybe output_list would add
information. Probably to save space metric_list is best.
Thanks,
Ian
> Signed-off-by: Jiri Olsa <jo...@kernel.org>
> ---
> tools/perf/util/metricgroup.c | 45 +++++++++++++++++------------------
> 1 file changed, 22 insertions(+), 23 deletions(-)
>
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index 9b880a5fb52b..0645ac1031fe 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -613,7 +613,7 @@ int __weak arch_get_runtimeparam(void)
> return 1;
> }
>
> -static int __add_metric(struct list_head *group_list,
> +static int __add_metric(struct list_head *list,
> struct pmu_event *pe,
> bool metric_no_group,
> int runtime,
> @@ -691,13 +691,13 @@ static int __add_metric(struct list_head *group_list,
> if (m->refs_cnt)
> return 0;
>
> - if (list_empty(group_list))
> - list_add(&m->nd, group_list);
> + if (list_empty(list))
> + list_add(&m->nd, list);
> else {
> struct list_head *pos;
>
> /* Place the largest groups at the front. */
> - list_for_each_prev(pos, group_list) {
> + list_for_each_prev(pos, list) {
> struct metric *old = list_entry(pos, struct metric,
> nd);
>
> if (hashmap__size(&m->pctx.ids) <=
> @@ -775,7 +775,7 @@ static int recursion_check(struct metric *m, const char
> *id, struct expr_id **pa
> return p->id ? 0 : -ENOMEM;
> }
>
> -static int add_metric(struct list_head *group_list,
> +static int add_metric(struct list_head *list,
> struct pmu_event *pe,
> bool metric_no_group,
> struct metric **mp,
> @@ -783,7 +783,7 @@ static int add_metric(struct list_head *group_list,
>
> static int resolve_metric(struct metric *m,
> bool metric_no_group,
> - struct list_head *group_list,
> + struct list_head *list,
> struct pmu_events_map *map)
> {
> struct hashmap_entry *cur;
> @@ -814,7 +814,7 @@ static int resolve_metric(struct metric *m,
> expr__del_id(&m->pctx, cur->key);
>
> /* ... and it gets resolved to the parent context. */
> - ret = add_metric(group_list, pe, metric_no_group, &m,
> parent);
> + ret = add_metric(list, pe, metric_no_group, &m,
> parent);
> if (ret)
> return ret;
>
> @@ -829,7 +829,7 @@ static int resolve_metric(struct metric *m,
> return 0;
> }
>
> -static int add_metric(struct list_head *group_list,
> +static int add_metric(struct list_head *list,
> struct pmu_event *pe,
> bool metric_no_group,
> struct metric **m,
> @@ -840,7 +840,7 @@ static int add_metric(struct list_head *group_list,
> pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);
>
> if (!strstr(pe->metric_expr, "?")) {
> - ret = __add_metric(group_list, pe, metric_no_group, 1, m,
> parent);
> + ret = __add_metric(list, pe, metric_no_group, 1, m, parent);
> } else {
> int j, count;
>
> @@ -848,11 +848,11 @@ static int add_metric(struct list_head *group_list,
>
> /* This loop is added to create multiple
> * events depend on count value and add
> - * those events to group_list.
> + * those events to list.
> */
>
> for (j = 0; j < count && !ret; j++) {
> - ret = __add_metric(group_list, pe, metric_no_group,
> j, m, parent);
> + ret = __add_metric(list, pe, metric_no_group, j, m,
> parent);
> }
> }
>
> @@ -861,7 +861,7 @@ static int add_metric(struct list_head *group_list,
>
> static int metricgroup__add_metric(const char *metric, bool metric_no_group,
> struct strbuf *events,
> - struct list_head *group_list,
> + struct list_head *list,
> struct pmu_events_map *map)
>
> {
> @@ -873,7 +873,7 @@ static int metricgroup__add_metric(const char *metric,
> bool metric_no_group,
> if (!pe)
> return -EINVAL;
>
> - ret = add_metric(group_list, pe, metric_no_group, &m, NULL);
> + ret = add_metric(list, pe, metric_no_group, &m, NULL);
> if (ret)
> return ret;
>
> @@ -881,8 +881,7 @@ static int metricgroup__add_metric(const char *metric,
> bool metric_no_group,
> * Process any possible referenced metrics
> * included in the expression.
> */
> - ret = resolve_metric(m, metric_no_group,
> - group_list, map);
> + ret = resolve_metric(m, metric_no_group, list, map);
> if (ret)
> return ret;
>
> @@ -905,7 +904,7 @@ static int metricgroup__add_metric(const char *metric,
> bool metric_no_group,
>
> static int metricgroup__add_metric_list(const char *list, bool
> metric_no_group,
> struct strbuf *events,
> - struct list_head *group_list,
> + struct list_head *mlist,
> struct pmu_events_map *map)
> {
> char *llist, *nlist, *p;
> @@ -921,7 +920,7 @@ static int metricgroup__add_metric_list(const char *list,
> bool metric_no_group,
>
> while ((p = strsep(&llist, ",")) != NULL) {
> ret = metricgroup__add_metric(p, metric_no_group, events,
> - group_list, map);
> + mlist, map);
> if (ret == -EINVAL) {
> fprintf(stderr, "Cannot find metric or group `%s'\n",
> p);
> @@ -955,11 +954,11 @@ static void metric__free_recursion(struct metric
> *metric)
> }
> }
>
> -static void metricgroup__free_metrics(struct list_head *group_list)
> +static void metricgroup__free_metrics(struct list_head *list)
> {
> struct metric *m, *tmp;
>
> - list_for_each_entry_safe (m, tmp, group_list, nd) {
> + list_for_each_entry_safe (m, tmp, list, nd) {
> metric__free_recursion(m);
> metric__free_refs(m);
> expr__ctx_clear(&m->pctx);
> @@ -977,13 +976,13 @@ static int parse_groups(struct evlist *perf_evlist,
> const char *str,
> {
> struct parse_events_error parse_error;
> struct strbuf extra_events;
> - LIST_HEAD(group_list);
> + LIST_HEAD(list);
> int ret;
>
> if (metric_events->nr_entries == 0)
> metricgroup__rblist_init(metric_events);
> ret = metricgroup__add_metric_list(str, metric_no_group,
> - &extra_events, &group_list, map);
> + &extra_events, &list, map);
> if (ret)
> return ret;
> pr_debug("adding %s\n", extra_events.buf);
> @@ -994,10 +993,10 @@ static int parse_groups(struct evlist *perf_evlist,
> const char *str,
> goto out;
> }
> strbuf_release(&extra_events);
> - ret = metricgroup__setup_events(&group_list, metric_no_merge,
> + ret = metricgroup__setup_events(&list, metric_no_merge,
> perf_evlist, metric_events);
> out:
> - metricgroup__free_metrics(&group_list);
> + metricgroup__free_metrics(&list);
> return ret;
> }
>
> --
> 2.25.4
>
