From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: kajoljain <kjain@linux.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Michael Petlan <mpetlan@redhat.com>,
Andi Kleen <ak@linux.intel.com>,
John Garry <john.garry@huawei.com>,
"Paul A. Clarke" <pc@us.ibm.com>,
Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH 03/19] perf metric: Change expr__get_id to return struct expr_id_data
Date: Tue, 28 Jul 2020 09:28:08 -0300 [thread overview]
Message-ID: <20200728122808.GJ40195@kernel.org> (raw)
In-Reply-To: <c5590463-0896-fa70-4c8f-77daa67a8e88@linux.ibm.com>
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@google.com>
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
>
> Reviewed-By : Kajol Jain<kjain@linux.ibm.com>
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
next prev parent reply other threads:[~2020-07-28 12:28 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-19 18:13 [PATCHv3 00/19] perf metric: Add support to reuse metric Jiri Olsa
2020-07-19 18:13 ` [PATCH 01/19] perf metric: Fix memory leak in expr__add_id function Jiri Olsa
2020-07-19 21:41 ` Ian Rogers
2020-07-28 12:26 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 02/19] perf metric: Add " Jiri Olsa
2020-07-26 9:16 ` kajoljain
2020-07-28 12:27 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 03/19] perf metric: Change expr__get_id to return struct expr_id_data Jiri Olsa
2020-07-26 9:17 ` kajoljain
2020-07-28 12:28 ` Arnaldo Carvalho de Melo [this message]
2020-07-19 18:13 ` [PATCH 04/19] perf metric: Add expr__del_id function Jiri Olsa
2020-07-26 9:17 ` kajoljain
2020-07-28 12:28 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 05/19] perf metric: Add macros for iterating map events Jiri Olsa
2020-07-19 21:46 ` Ian Rogers
2020-07-28 12:29 ` Arnaldo Carvalho de Melo
2020-07-26 9:17 ` kajoljain
2020-07-19 18:13 ` [PATCH 06/19] perf metric: Add add_metric function Jiri Olsa
2020-07-26 9:17 ` kajoljain
2020-07-28 12:30 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 07/19] perf metric: Rename __metricgroup__add_metric to __add_metric Jiri Olsa
2020-07-26 9:18 ` kajoljain
2020-07-28 12:30 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 08/19] perf metric: Collect referenced metrics in struct metric_ref_node Jiri Olsa
2020-07-19 22:18 ` Ian Rogers
2020-07-26 9:18 ` kajoljain
2020-07-28 12:31 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 09/19] perf metric: Collect referenced metrics in struct metric_expr Jiri Olsa
2020-07-26 9:18 ` kajoljain
2020-07-28 12:32 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 10/19] perf metric: Add referenced metrics to hash data Jiri Olsa
2020-07-19 22:32 ` Ian Rogers
2020-07-26 9:18 ` kajoljain
2020-07-28 12:32 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 11/19] perf metric: Compute referenced metrics Jiri Olsa
2020-07-26 9:19 ` kajoljain
2020-07-28 12:33 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 12/19] perf metric: Add events for the current list Jiri Olsa
2020-07-19 22:34 ` Ian Rogers
2020-07-26 9:19 ` kajoljain
2020-07-28 12:33 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 13/19] perf metric: Add cache_miss_cycles to metric parse test Jiri Olsa
2020-07-26 9:19 ` kajoljain
2020-07-28 12:34 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 14/19] perf metric: Add DCache_L2 " Jiri Olsa
2020-07-26 9:19 ` kajoljain
2020-07-28 12:34 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 15/19] perf metric: Add recursion check when processing nested metrics Jiri Olsa
2020-07-19 22:40 ` Ian Rogers
2020-07-26 9:20 ` kajoljain
2020-07-28 12:35 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 16/19] perf metric: Make compute_single function more precise Jiri Olsa
2020-07-28 12:36 ` Arnaldo Carvalho de Melo
2020-07-28 17:26 ` Ian Rogers
2020-07-28 20:17 ` kajoljain
2020-07-29 11:08 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 17/19] perf metric: Add metric group test Jiri Olsa
2020-07-19 22:41 ` Ian Rogers
2020-07-26 9:20 ` kajoljain
2020-07-28 12:37 ` Arnaldo Carvalho de Melo
2020-07-19 18:13 ` [PATCH 18/19] perf metric: Rename struct egroup to metric Jiri Olsa
2020-07-26 9:20 ` kajoljain
2020-07-19 18:13 ` [PATCH 19/19] perf metric: Rename group_list to metric_list Jiri Olsa
2020-07-19 22:42 ` Ian Rogers
2020-07-26 9:21 ` kajoljain
2020-07-28 12:38 ` Arnaldo Carvalho de Melo
2020-07-20 6:44 ` [PATCHv3 00/19] perf metric: Add support to reuse metric kajoljain
2020-07-20 7:22 ` Jiri Olsa
2020-07-20 8:09 ` kajoljain
2020-07-20 8:19 ` Jiri Olsa
2020-07-20 9:02 ` kajoljain
2020-07-20 19:16 ` Jiri Olsa
2020-07-24 5:52 ` kajoljain
2020-07-25 11:51 ` Jiri Olsa
2020-07-26 9:14 ` kajoljain
2020-07-28 12:39 ` Arnaldo Carvalho de Melo
2020-07-28 12:54 ` Jiri Olsa
2020-07-28 13:01 ` Jiri Olsa
2020-07-28 13:34 ` [PATCHv3 20/19] perf metric: Fix runtime metric for powerpc Jiri Olsa
2020-07-28 15:22 ` [PATCHv3 00/19] perf metric: Add support to reuse metric Arnaldo Carvalho de Melo
2020-07-21 14:48 ` Paul A. Clarke
2020-07-22 18:11 ` Jiri Olsa
2020-07-23 15:59 ` Paul A. Clarke
2020-07-25 11:52 ` Jiri Olsa
2020-07-28 12:42 ` Arnaldo Carvalho de Melo
2020-07-23 17:14 ` Paul A. Clarke
2020-07-23 17:40 ` Andi Kleen
2020-07-29 9:18 [PATCHv4 " Jiri Olsa
2020-07-29 9:18 ` [PATCH 03/19] perf metric: Change expr__get_id to return struct expr_id_data Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200728122808.GJ40195@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=john.garry@huawei.com \
--cc=jolsa@kernel.org \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=pc@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).