Em Tue, Jul 14, 2020 at 02:05:36PM -0700, Ian Rogers escreveu:
> On Sun, Jul 12, 2020 at 6:26 AM Jiri Olsa <[email protected]> wrote:
> >
> > Renaming expr__add_id to expr__add_val so we can use
> > expr__add_id to actually add just id without any value
> > in following changes.
> >
> > There's no functional change.
> >
> > Signed-off-by: Jiri Olsa <[email protected]>
>
> Acked-by: Ian Rogers <[email protected]>
Thanks, applied.
- Arnaldo
> Thanks,
> Ian
>
> > ---
> > tools/perf/tests/expr.c | 4 ++--
> > tools/perf/tests/pmu-events.c | 4 ++--
> > tools/perf/util/expr.c | 2 +-
> > tools/perf/util/expr.h | 2 +-
> > tools/perf/util/expr.y | 2 +-
> > tools/perf/util/stat-shadow.c | 4 ++--
> > 6 files changed, 9 insertions(+), 9 deletions(-)
> >
> > diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c
> > index b7e5ef3007fc..d13fc1dfd5ef 100644
> > --- a/tools/perf/tests/expr.c
> > +++ b/tools/perf/tests/expr.c
> > @@ -24,8 +24,8 @@ int test__expr(struct test *t __maybe_unused, int subtest
> > __maybe_unused)
> > struct expr_parse_ctx ctx;
> >
> > expr__ctx_init(&ctx);
> > - expr__add_id(&ctx, strdup("FOO"), 1);
> > - expr__add_id(&ctx, strdup("BAR"), 2);
> > + expr__add_id_val(&ctx, strdup("FOO"), 1);
> > + expr__add_id_val(&ctx, strdup("BAR"), 2);
> >
> > ret = test(&ctx, "1+1", 2);
> > ret |= test(&ctx, "FOO+BAR", 3);
> > diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
> > index b66b021476ec..eb19f9a0bc15 100644
> > --- a/tools/perf/tests/pmu-events.c
> > +++ b/tools/perf/tests/pmu-events.c
> > @@ -492,7 +492,7 @@ static int test_parsing(void)
> > */
> > k = 1;
> > hashmap__for_each_entry((&ctx.ids), cur, bkt)
> > - expr__add_id(&ctx, strdup(cur->key), k++);
> > + expr__add_id_val(&ctx, strdup(cur->key),
> > k++);
> >
> > hashmap__for_each_entry((&ctx.ids), cur, bkt) {
> > if (check_parse_cpu(cur->key, map ==
> > cpus_map,
> > @@ -547,7 +547,7 @@ static int metric_parse_fake(const char *str)
> > */
> > i = 1;
> > hashmap__for_each_entry((&ctx.ids), cur, bkt)
> > - expr__add_id(&ctx, strdup(cur->key), i++);
> > + expr__add_id_val(&ctx, strdup(cur->key), i++);
> >
> > hashmap__for_each_entry((&ctx.ids), cur, bkt) {
> > if (check_parse_fake(cur->key)) {
> > diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
> > index e8f777830a23..9116a3a01eea 100644
> > --- a/tools/perf/util/expr.c
> > +++ b/tools/perf/util/expr.c
> > @@ -33,7 +33,7 @@ static bool key_equal(const void *key1, const void *key2,
> > }
> >
> > /* Caller must make sure id is allocated */
> > -int expr__add_id(struct expr_parse_ctx *ctx, const char *name, double val)
> > +int expr__add_id_val(struct expr_parse_ctx *ctx, const char *name, double
> > val)
> > {
> > double *val_ptr = NULL, *old_val = NULL;
> > char *old_key = NULL;
> > diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h
> > index 8a2c1074f90f..bb6bac836b48 100644
> > --- a/tools/perf/util/expr.h
> > +++ b/tools/perf/util/expr.h
> > @@ -22,7 +22,7 @@ struct expr_scanner_ctx {
> >
> > void expr__ctx_init(struct expr_parse_ctx *ctx);
> > void expr__ctx_clear(struct expr_parse_ctx *ctx);
> > -int expr__add_id(struct expr_parse_ctx *ctx, const char *id, double val);
> > +int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double
> > val);
> > int expr__get_id(struct expr_parse_ctx *ctx, const char *id, double
> > *val_ptr);
> > int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
> > const char *expr, int runtime);
> > diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
> > index 5fcb98800f9c..b2b3420ea6ec 100644
> > --- a/tools/perf/util/expr.y
> > +++ b/tools/perf/util/expr.y
> > @@ -69,7 +69,7 @@ all_other: all_other other
> >
> > other: ID
> > {
> > - expr__add_id(ctx, $1, 0.0);
> > + expr__add_id_val(ctx, $1, 0.0);
> > }
> > |
> > MIN | MAX | IF | ELSE | SMT_ON | NUMBER | '|' | '^' | '&' | '-' | '+' |
> > '*' | '/' | '%' | '(' | ')' | ','
> > diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
> > index 8fdef47005e6..fc9ac4b4218e 100644
> > --- a/tools/perf/util/stat-shadow.c
> > +++ b/tools/perf/util/stat-shadow.c
> > @@ -773,9 +773,9 @@ static int prepare_metric(struct evsel **metric_events,
> > *pn = 0;
> >
> > if (metric_total)
> > - expr__add_id(pctx, n, metric_total);
> > + expr__add_id_val(pctx, n, metric_total);
> > else
> > - expr__add_id(pctx, n, avg_stats(stats)*scale);
> > + expr__add_id_val(pctx, n, avg_stats(stats)*scale);
> > }
> >
> > return i;
> > --
> > 2.25.4
> >
--
- Arnaldo
