From: Kajol Jain <kjain@linux.ibm.com> To: acme@kernel.org, linuxppc-dev@lists.ozlabs.org, mpe@ellerman.id.au, sukadev@linux.vnet.ibm.com Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, anju@linux.vnet.ibm.com, maddy@linux.vnet.ibm.com, ravi.bangoria@linux.ibm.com, peterz@infradead.org, yao.jin@linux.intel.com, ak@linux.intel.com, jolsa@kernel.org, kan.liang@linux.intel.com, jmario@redhat.com, alexander.shishkin@linux.intel.com, mingo@kernel.org, paulus@ozlabs.org, namhyung@kernel.org, mpetlan@redhat.com, gregkh@linuxfoundation.org, benh@kernel.crashing.org, mamatha4@linux.vnet.ibm.com, mark.rutland@arm.com, tglx@linutronix.de, kjain@linux.ibm.com Subject: [PATCH v8 2/7] perf expr: Add expr_scanner_ctx object Date: Thu, 2 Apr 2020 02:03:35 +0530 [thread overview] Message-ID: <20200401203340.31402-3-kjain@linux.ibm.com> (raw) In-Reply-To: <20200401203340.31402-1-kjain@linux.ibm.com> From: Jiri Olsa <jolsa@kernel.org> Adding expr_scanner_ctx object to hold user data for the expr scanner. Currently it holds only start_token, Kajol Jain will use it to hold 24x7 runtime param. Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/perf/util/expr.c | 6 ++++-- tools/perf/util/expr.h | 4 ++++ tools/perf/util/expr.l | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index c8ccc548a585..c3382d58cf40 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -3,7 +3,6 @@ #include <assert.h> #include "expr.h" #include "expr-bison.h" -#define YY_EXTRA_TYPE int #include "expr-flex.h" #ifdef PARSER_DEBUG @@ -30,11 +29,14 @@ static int __expr__parse(double *val, struct expr_parse_ctx *ctx, const char *expr, int start) { + struct expr_scanner_ctx scanner_ctx = { + .start_token = start, + }; YY_BUFFER_STATE buffer; void *scanner; int ret; - ret = expr_lex_init_extra(start, &scanner); + ret = expr_lex_init_extra(&scanner_ctx, &scanner); if (ret) return ret; diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h index b9e53f2b5844..0938ad166ece 100644 --- a/tools/perf/util/expr.h +++ b/tools/perf/util/expr.h @@ -15,6 +15,10 @@ struct expr_parse_ctx { struct expr_parse_id ids[MAX_PARSE_ID]; }; +struct expr_scanner_ctx { + int start_token; +}; + void expr__ctx_init(struct expr_parse_ctx *ctx); void expr__add_id(struct expr_parse_ctx *ctx, const char *id, double val); int expr__parse(double *final_val, struct expr_parse_ctx *ctx, const char *expr); diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l index eaad29243c23..2582c2464938 100644 --- a/tools/perf/util/expr.l +++ b/tools/perf/util/expr.l @@ -76,13 +76,13 @@ sym [0-9a-zA-Z_\.:@]+ symbol {spec}*{sym}*{spec}*{sym}* %% - { - int start_token; + struct expr_scanner_ctx *sctx = expr_get_extra(yyscanner); - start_token = expr_get_extra(yyscanner); + { + int start_token = sctx->start_token; - if (start_token) { - expr_set_extra(NULL, yyscanner); + if (sctx->start_token) { + sctx->start_token = 0; return start_token; } } -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Kajol Jain <kjain@linux.ibm.com> To: acme@kernel.org, linuxppc-dev@lists.ozlabs.org, mpe@ellerman.id.au, sukadev@linux.vnet.ibm.com Cc: mark.rutland@arm.com, maddy@linux.vnet.ibm.com, peterz@infradead.org, yao.jin@linux.intel.com, mingo@kernel.org, kan.liang@linux.intel.com, ak@linux.intel.com, alexander.shishkin@linux.intel.com, anju@linux.vnet.ibm.com, mamatha4@linux.vnet.ibm.com, ravi.bangoria@linux.ibm.com, kjain@linux.ibm.com, jmario@redhat.com, namhyung@kernel.org, tglx@linutronix.de, mpetlan@redhat.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, jolsa@kernel.org Subject: [PATCH v8 2/7] perf expr: Add expr_scanner_ctx object Date: Thu, 2 Apr 2020 02:03:35 +0530 [thread overview] Message-ID: <20200401203340.31402-3-kjain@linux.ibm.com> (raw) In-Reply-To: <20200401203340.31402-1-kjain@linux.ibm.com> From: Jiri Olsa <jolsa@kernel.org> Adding expr_scanner_ctx object to hold user data for the expr scanner. Currently it holds only start_token, Kajol Jain will use it to hold 24x7 runtime param. Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/perf/util/expr.c | 6 ++++-- tools/perf/util/expr.h | 4 ++++ tools/perf/util/expr.l | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index c8ccc548a585..c3382d58cf40 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -3,7 +3,6 @@ #include <assert.h> #include "expr.h" #include "expr-bison.h" -#define YY_EXTRA_TYPE int #include "expr-flex.h" #ifdef PARSER_DEBUG @@ -30,11 +29,14 @@ static int __expr__parse(double *val, struct expr_parse_ctx *ctx, const char *expr, int start) { + struct expr_scanner_ctx scanner_ctx = { + .start_token = start, + }; YY_BUFFER_STATE buffer; void *scanner; int ret; - ret = expr_lex_init_extra(start, &scanner); + ret = expr_lex_init_extra(&scanner_ctx, &scanner); if (ret) return ret; diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h index b9e53f2b5844..0938ad166ece 100644 --- a/tools/perf/util/expr.h +++ b/tools/perf/util/expr.h @@ -15,6 +15,10 @@ struct expr_parse_ctx { struct expr_parse_id ids[MAX_PARSE_ID]; }; +struct expr_scanner_ctx { + int start_token; +}; + void expr__ctx_init(struct expr_parse_ctx *ctx); void expr__add_id(struct expr_parse_ctx *ctx, const char *id, double val); int expr__parse(double *final_val, struct expr_parse_ctx *ctx, const char *expr); diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l index eaad29243c23..2582c2464938 100644 --- a/tools/perf/util/expr.l +++ b/tools/perf/util/expr.l @@ -76,13 +76,13 @@ sym [0-9a-zA-Z_\.:@]+ symbol {spec}*{sym}*{spec}*{sym}* %% - { - int start_token; + struct expr_scanner_ctx *sctx = expr_get_extra(yyscanner); - start_token = expr_get_extra(yyscanner); + { + int start_token = sctx->start_token; - if (start_token) { - expr_set_extra(NULL, yyscanner); + if (sctx->start_token) { + sctx->start_token = 0; return start_token; } } -- 2.21.0
next prev parent reply other threads:[~2020-04-01 20:34 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-01 20:33 [PATCH v8 0/7] powerpc/perf: Add json file metric support for the hv_24x7 socket/chip level events Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-01 20:33 ` [PATCH v8 1/7] perf expr: Add expr_ prefix for parse_ctx and parse_id Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-06 14:13 ` Arnaldo Carvalho de Melo 2020-04-06 14:13 ` Arnaldo Carvalho de Melo 2020-04-07 7:11 ` kajoljain 2020-04-07 7:11 ` kajoljain 2020-04-22 12:17 ` [tip: perf/core] " tip-bot2 for Jiri Olsa 2020-04-22 12:17 ` tip-bot2 for Jiri Olsa 2020-04-01 20:33 ` Kajol Jain [this message] 2020-04-01 20:33 ` [PATCH v8 2/7] perf expr: Add expr_scanner_ctx object Kajol Jain 2020-04-22 12:17 ` [tip: perf/core] " tip-bot2 for Jiri Olsa 2020-04-22 12:17 ` tip-bot2 for Jiri Olsa 2020-04-01 20:33 ` [PATCH v8 3/7] perf/tools: Refactoring metricgroup__add_metric function Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-22 12:17 ` [tip: perf/core] perf metrictroup: Split the " tip-bot2 for Kajol Jain 2020-04-22 12:17 ` tip-bot2 for Kajol Jain 2020-04-01 20:33 ` [PATCH v8 4/7] perf/tools: Enhance JSON/metric infrastructure to handle "?" Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-05-01 15:56 ` Ian Rogers 2020-05-01 15:56 ` Ian Rogers 2020-05-01 15:56 ` Ian Rogers 2020-05-08 13:05 ` [tip: perf/core] perf metricgroups: " tip-bot2 for Kajol Jain 2020-05-08 13:05 ` tip-bot2 for Kajol Jain 2020-04-01 20:33 ` [PATCH v8 5/7] perf/tests/expr: Added test for runtime param in metric expression Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-05-08 13:05 ` [tip: perf/core] perf tests expr: " tip-bot2 for Kajol Jain 2020-05-08 13:05 ` tip-bot2 for Kajol Jain 2020-04-01 20:33 ` [PATCH v8 6/7] tools/perf: Enable Hz/hz prinitg for --metric-only option Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-02 12:49 ` Jiri Olsa 2020-04-02 12:49 ` Jiri Olsa 2020-04-02 20:42 ` Andi Kleen 2020-04-02 20:42 ` Andi Kleen 2020-05-08 13:05 ` [tip: perf/core] perf tools: " tip-bot2 for Kajol Jain 2020-05-08 13:05 ` tip-bot2 for Kajol Jain 2020-04-01 20:33 ` [PATCH v8 7/7] perf/tools/pmu-events/powerpc: Add hv_24x7 socket/chip level metric events Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-05-08 13:05 ` [tip: perf/core] perf vendor events power9: " tip-bot2 for Kajol Jain 2020-05-08 13:05 ` tip-bot2 for Kajol Jain 2020-04-02 21:27 ` [PATCH v8 0/7] powerpc/perf: Add json file metric support for the hv_24x7 socket/chip level events Jiri Olsa 2020-04-02 21:27 ` Jiri Olsa 2020-04-28 6:32 ` kajoljain 2020-04-28 6:32 ` kajoljain 2020-04-29 14:46 ` Arnaldo Carvalho de Melo 2020-04-29 14:46 ` Arnaldo Carvalho de Melo
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=20200401203340.31402-3-kjain@linux.ibm.com \ --to=kjain@linux.ibm.com \ --cc=acme@kernel.org \ --cc=ak@linux.intel.com \ --cc=alexander.shishkin@linux.intel.com \ --cc=anju@linux.vnet.ibm.com \ --cc=benh@kernel.crashing.org \ --cc=gregkh@linuxfoundation.org \ --cc=jmario@redhat.com \ --cc=jolsa@kernel.org \ --cc=kan.liang@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-perf-users@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=maddy@linux.vnet.ibm.com \ --cc=mamatha4@linux.vnet.ibm.com \ --cc=mark.rutland@arm.com \ --cc=mingo@kernel.org \ --cc=mpe@ellerman.id.au \ --cc=mpetlan@redhat.com \ --cc=namhyung@kernel.org \ --cc=paulus@ozlabs.org \ --cc=peterz@infradead.org \ --cc=ravi.bangoria@linux.ibm.com \ --cc=sukadev@linux.vnet.ibm.com \ --cc=tglx@linutronix.de \ --cc=yao.jin@linux.intel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.