On Fri, Jun 26, 2020 at 02:16:30PM -0700, Ian Rogers wrote: > On Fri, Jun 26, 2020 at 12:48 PM Jiri Olsa <[email protected]> wrote: > > > > Adding other metrics to the parsing context so they > > can be resolved during the metric processing. > > > > Adding expr__add_other function to store 'other' metrics > > into parse context. > > > > Signed-off-by: Jiri Olsa <[email protected]> > > --- > > tools/perf/util/expr.c | 35 +++++++++++++++++++++++++++++++++++ > > tools/perf/util/expr.h | 13 ++++++++++++- > > tools/perf/util/stat-shadow.c | 19 +++++++++++++------ > > 3 files changed, 60 insertions(+), 7 deletions(-) > > > > diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c > > index cd73dae4588c..32f7acac7c19 100644 > > --- a/tools/perf/util/expr.c > > +++ b/tools/perf/util/expr.c > > @@ -4,6 +4,8 @@ > > #include <errno.h> > > #include <stdlib.h> > > #include <string.h> > > +#include "metricgroup.h" > > +#include "debug.h" > > #include "expr.h" > > #include "expr-bison.h" > > #include "expr-flex.h" > > @@ -61,6 +63,7 @@ int expr__add_val(struct expr_parse_ctx *ctx, const char > > *name, double val) > > if (!data_ptr) > > return -ENOMEM; > > data_ptr->val = val; > > + data_ptr->is_other = false; > > > > ret = hashmap__set(&ctx->ids, name, data_ptr, > > (const void **)&old_key, (void **)&old_data); > > @@ -69,6 +72,38 @@ int expr__add_val(struct expr_parse_ctx *ctx, const char > > *name, double val) > > return ret; > > } > > > > +int expr__add_other(struct expr_parse_ctx *ctx, struct metric_other *other) > > +{ > > + struct expr_parse_data *data_ptr = NULL, *old_data = NULL; > > + char *old_key = NULL; > > + char *name; > > + int ret; > > + > > + data_ptr = malloc(sizeof(*data_ptr)); > > + if (!data_ptr) > > + return -ENOMEM; > > + > > + name = strdup(other->metric_name); > > + if (!name) { > > + free(data_ptr); > > + return -ENOMEM; > > + } > > + > > + data_ptr->other.metric_name = other->metric_name; > > + data_ptr->other.metric_expr = other->metric_expr; > > + data_ptr->is_other = true; > > + > > + ret = hashmap__set(&ctx->ids, name, data_ptr, > > + (const void **)&old_key, (void **)&old_data); > > + > > + pr_debug2("adding other metric %s: %s\n", > > + other->metric_name, other->metric_expr); > > + > > + free(old_key); > > + free(old_data); > > + return ret; > > +} > > + > > int expr__get_id(struct expr_parse_ctx *ctx, const char *id, > > struct expr_parse_data **data) > > { > > diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h > > index fd924bb4e5cd..ed60f9227b43 100644 > > --- a/tools/perf/util/expr.h > > +++ b/tools/perf/util/expr.h > > @@ -11,12 +11,22 @@ > > #include "util/hashmap.h" > > //#endif > > > > +struct metric_other; > > + > > struct expr_parse_ctx { > > struct hashmap ids; > > }; > > > > struct expr_parse_data { > > - double val; > > + bool is_other; > > + > > + union { > > + double val; > > + struct { > > + const char *metric_name; > > + const char *metric_expr; > > It is probably worth a comment why both the metric_name and the > metric's expression are required here? The parse and other data for > the metric won't be here.
it's there to have it ready when processing the metric, I'll add some more comments in here thanks, jirka
