From: "tip-bot2 for Jiri Olsa" <tip-bot2@linutronix.de> To: linux-tip-commits@vger.kernel.org Cc: Jiri Olsa <jolsa@kernel.org>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Andi Kleen <ak@linux.intel.com>, Anju T Sudhakar <anju@linux.vnet.ibm.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>, Jin Yao <yao.jin@linux.intel.com>, Joe Mario <jmario@redhat.com>, Kajol Jain <kjain@linux.ibm.com>, Kan Liang <kan.liang@linux.intel.com>, Madhavan Srinivasan <maddy@linux.vnet.ibm.com>, Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>, Mark Rutland <mark.rutland@arm.com>, Michael Ellerman <mpe@ellerman.id.au>, Michael Petlan <mpetlan@redhat.com>, Namhyung Kim <namhyung@kernel.org>, Paul Mackerras <paulus@ozlabs.org>, Peter Zijlstra <peterz@infradead.org>, Ravi Bangoria <ravi.bangoria@linux.ibm.com>, Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>, Thomas Gleixner <tglx@linutronix.de>, linuxppc-dev@lists.ozlabs.org, Arnaldo Carvalho de Melo <acme@redhat.com>, x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org> Subject: [tip: perf/core] perf expr: Add expr_scanner_ctx object Date: Wed, 22 Apr 2020 12:17:28 -0000 [thread overview] Message-ID: <158755784848.28353.17588548435578970529.tip-bot2@tip-bot2> (raw) In-Reply-To: <20200401203340.31402-3-kjain@linux.ibm.com> The following commit has been merged into the perf/core branch of tip: Commit-ID: 871f9f599db8d9d2387c0717e712af405290edea Gitweb: https://git.kernel.org/tip/871f9f599db8d9d2387c0717e712af405290edea Author: Jiri Olsa <jolsa@kernel.org> AuthorDate: Thu, 02 Apr 2020 02:03:35 +05:30 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitterDate: Thu, 16 Apr 2020 12:19:13 -03:00 perf expr: Add expr_scanner_ctx object Add the 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> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Anju T Sudhakar <anju@linux.vnet.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Joe Mario <jmario@redhat.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> Cc: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@ozlabs.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linuxppc-dev@lists.ozlabs.org Link: http://lore.kernel.org/lkml/20200401203340.31402-3-kjain@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- 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 c8ccc54..c3382d5 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 b9e53f2..0938ad1 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 eaad292..2582c24 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; } }
WARNING: multiple messages have this Message-ID (diff)
From: "tip-bot2 for Jiri Olsa" <tip-bot2@linutronix.de> To: linux-tip-commits@vger.kernel.org Cc: Mark Rutland <mark.rutland@arm.com>, Madhavan Srinivasan <maddy@linux.vnet.ibm.com>, Peter Zijlstra <peterz@infradead.org>, Jin Yao <yao.jin@linux.intel.com>, Kan Liang <kan.liang@linux.intel.com>, Andi Kleen <ak@linux.intel.com>, x86 <x86@kernel.org>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Anju T Sudhakar <anju@linux.vnet.ibm.com>, Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>, Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>, Ravi Bangoria <ravi.bangoria@linux.ibm.com>, Kajol Jain <kjain@linux.ibm.com>, Arnaldo Carvalho de Melo <acme@redhat.com>, Joe Mario <jmario@redhat.com>, Namhyung Kim <namhyung@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, Michael Petlan <mpetlan@redhat.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, LKML <linux-kernel@vger.kernel.org>, Jiri Olsa <jolsa@kernel.org>, linuxppc-dev@lists.ozlabs.org Subject: [tip: perf/core] perf expr: Add expr_scanner_ctx object Date: Wed, 22 Apr 2020 12:17:28 -0000 [thread overview] Message-ID: <158755784848.28353.17588548435578970529.tip-bot2@tip-bot2> (raw) In-Reply-To: <20200401203340.31402-3-kjain@linux.ibm.com> The following commit has been merged into the perf/core branch of tip: Commit-ID: 871f9f599db8d9d2387c0717e712af405290edea Gitweb: https://git.kernel.org/tip/871f9f599db8d9d2387c0717e712af405290edea Author: Jiri Olsa <jolsa@kernel.org> AuthorDate: Thu, 02 Apr 2020 02:03:35 +05:30 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitterDate: Thu, 16 Apr 2020 12:19:13 -03:00 perf expr: Add expr_scanner_ctx object Add the 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> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Anju T Sudhakar <anju@linux.vnet.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Joe Mario <jmario@redhat.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com> Cc: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@ozlabs.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linuxppc-dev@lists.ozlabs.org Link: http://lore.kernel.org/lkml/20200401203340.31402-3-kjain@linux.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- 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 c8ccc54..c3382d5 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 b9e53f2..0938ad1 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 eaad292..2582c24 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; } }
next prev parent reply other threads:[~2020-04-22 12:20 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 ` [PATCH v8 2/7] perf expr: Add expr_scanner_ctx object Kajol Jain 2020-04-01 20:33 ` Kajol Jain 2020-04-22 12:17 ` tip-bot2 for Jiri Olsa [this message] 2020-04-22 12:17 ` [tip: perf/core] " 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=158755784848.28353.17588548435578970529.tip-bot2@tip-bot2 \ --to=tip-bot2@linutronix.de \ --cc=acme@redhat.com \ --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=kjain@linux.ibm.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@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=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=x86@kernel.org \ --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.