Re: [PATCH 03/19] perf metric: Change expr__get_id to return struct expr_id_data

[Arnaldo Carvalho de Melo]

Em Sun, Jul 26, 2020 at 02:47:00PM +0530, kajoljain escreveu:
> 
> 
> On 7/19/20 11:43 PM, Jiri Olsa wrote:
> > Changing expr__get_id to use and return struct expr_id_data
> > pointer as value for the ID. This way we can access data other
> > than value for given ID in following changes.
> > 
> > Acked-by: Ian Rogers <irogers@xxxxxxxxxx>
> > Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> > ---
> 
> Reviewed-By : Kajol Jain<kjain@xxxxxxxxxxxxx>

Thanks, applied.

- Arnaldo
 
> Thanks,
> Kajol Jain
> 
> >  tools/perf/util/expr.c | 10 +++-------
> >  tools/perf/util/expr.h |  3 ++-
> >  tools/perf/util/expr.y | 14 +++++++++-----
> >  3 files changed, 14 insertions(+), 13 deletions(-)
> > 
> > diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
> > index 9228f60e2a20..4e5a6533dfce 100644
> > --- a/tools/perf/util/expr.c
> > +++ b/tools/perf/util/expr.c
> > @@ -73,14 +73,10 @@ int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val)
> >  	return ret;
> >  }
> >  
> > -int expr__get_id(struct expr_parse_ctx *ctx, const char *id, double *val_ptr)
> > +int expr__get_id(struct expr_parse_ctx *ctx, const char *id,
> > +		 struct expr_id_data **data)
> >  {
> > -	struct expr_id_data *data;
> > -
> > -	if (!hashmap__find(&ctx->ids, id, (void **)&data))
> > -		return -1;
> > -	*val_ptr = (data == NULL) ?  0.0 : data->val;
> > -	return 0;
> > +	return hashmap__find(&ctx->ids, id, (void **)data) ? 0 : -1;
> >  }
> >  
> >  void expr__ctx_init(struct expr_parse_ctx *ctx)
> > diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h
> > index ac32cda42006..f38292fdab19 100644
> > --- a/tools/perf/util/expr.h
> > +++ b/tools/perf/util/expr.h
> > @@ -28,7 +28,8 @@ 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);
> >  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__get_id(struct expr_parse_ctx *ctx, const char *id,
> > +		 struct expr_id_data **data);
> >  int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
> >  		const char *expr, int runtime);
> >  int expr__find_other(const char *expr, const char *one,
> > diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
> > index 8befe4a46f87..0d4f5d324be7 100644
> > --- a/tools/perf/util/expr.y
> > +++ b/tools/perf/util/expr.y
> > @@ -85,12 +85,16 @@ if_expr:
> >  	;
> >  
> >  expr:	  NUMBER
> > -	| ID			{ if (expr__get_id(ctx, $1, &$$)) {
> > -					pr_debug("%s not found\n", $1);
> > +	| ID			{
> > +					struct expr_id_data *data;
> > +
> > +					if (expr__get_id(ctx, $1, &data) || !data) {
> > +						pr_debug("%s not found\n", $1);
> > +						free($1);
> > +						YYABORT;
> > +					}
> > +					$$ = data->val;
> >  					free($1);
> > -					YYABORT;
> > -				  }
> > -				  free($1);
> >  				}
> >  	| expr '|' expr		{ $$ = (long)$1 | (long)$3; }
> >  	| expr '&' expr		{ $$ = (long)$1 & (long)$3; }
> > 

-- 

- Arnaldo