Re: [PATCH 02/10] perf tools: Add struct expr_parse_data to keep expr value

From: Ian Rogers
Date: Fri Jun 26 2020 - 16:05:03 EST


On Fri, Jun 26, 2020 at 12:47 PM Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
>
> Adding struct expr_parse_data to keep expr value
> instead of just simple double pointer, so we can
> store more data for ID in following changes.

Nit, expr_parse_data sounds a bit like data that is created just at
parse time. Perhaps id_data, for data associated with an id?

Thanks,
Ian

> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> ---
> tools/perf/tests/expr.c | 3 ++-
> tools/perf/util/expr.c | 20 ++++++++++----------
> tools/perf/util/expr.h | 4 ++++
> tools/perf/util/metricgroup.c | 2 +-
> 4 files changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
> index 82aa32fcab64..e64461f1a24c 100644
> --- a/tools/perf/tests/expr.c
> +++ b/tools/perf/tests/expr.c
> @@ -18,8 +18,9 @@ static int test(struct expr_parse_ctx *ctx, const char *e, double val2)
>
> int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
> {
> + struct expr_parse_data *val_ptr;
> const char *p;
> - double val, *val_ptr;
> + double val;
> int ret;
> struct expr_parse_ctx ctx;
>
> diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
> index a02937e5f3ac..7573b21e73df 100644
> --- a/tools/perf/util/expr.c
> +++ b/tools/perf/util/expr.c
> @@ -35,30 +35,30 @@ static bool key_equal(const void *key1, const void *key2,
> /* Caller must make sure id is allocated */
> int expr__add_val(struct expr_parse_ctx *ctx, const char *name, double val)
> {
> - double *val_ptr = NULL, *old_val = NULL;
> + struct expr_parse_data *data_ptr = NULL, *old_data = NULL;
> char *old_key = NULL;
> int ret;
>
> if (val != 0.0) {
> - val_ptr = malloc(sizeof(double));
> - if (!val_ptr)
> + data_ptr = malloc(sizeof(*data_ptr));
> + if (!data_ptr)
> return -ENOMEM;
> - *val_ptr = val;
> + data_ptr->val = val;
> }
> - ret = hashmap__set(&ctx->ids, name, val_ptr,
> - (const void **)&old_key, (void **)&old_val);
> + ret = hashmap__set(&ctx->ids, name, data_ptr,
> + (const void **)&old_key, (void **)&old_data);
> free(old_key);
> - free(old_val);
> + free(old_data);
> return ret;
> }
>
> int expr__get_id(struct expr_parse_ctx *ctx, const char *id, double *val_ptr)
> {
> - double *data;
> + struct expr_parse_data *data;
>
> if (!hashmap__find(&ctx->ids, id, (void **)&data))
> return -1;
> - *val_ptr = (data == NULL) ? 0.0 : *data;
> + *val_ptr = (data == NULL) ? 0.0 : data->val;
> return 0;
> }
>
> @@ -119,7 +119,7 @@ int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
> int expr__find_other(const char *expr, const char *one,
> struct expr_parse_ctx *ctx, int runtime)
> {
> - double *old_val = NULL;
> + struct expr_parse_data *old_val = NULL;
> char *old_key = NULL;
> int ret = __expr__parse(NULL, ctx, expr, EXPR_OTHER, runtime);
>
> diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h
> index 35bdc609cf55..f9f16efe76bc 100644
> --- a/tools/perf/util/expr.h
> +++ b/tools/perf/util/expr.h
> @@ -15,6 +15,10 @@ struct expr_parse_ctx {
> struct hashmap ids;
> };
>
> +struct expr_parse_data {
> + double val;
> +};
> +
> struct expr_scanner_ctx {
> int start_token;
> int runtime;
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index 82fecb5a302d..85e7fa2e2707 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -138,7 +138,7 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
> unsigned long *evlist_used)
> {
> struct evsel *ev, *current_leader = NULL;
> - double *val_ptr;
> + struct expr_parse_data *val_ptr;
> int i = 0, matched_events = 0, events_to_match;
> const int idnum = (int)hashmap__size(&pctx->ids);
>
> --
> 2.25.4
>