From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: 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>,
Joe Mario <jmario@redhat.com>, Andi Kleen <ak@linux.intel.com>,
Kajol Jain <kjain@linux.ibm.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH 2/3] perf expr: Allow comments in custom metric file
Date: Tue, 21 Apr 2020 20:13:35 +0200 [thread overview]
Message-ID: <20200421181337.988681-3-jolsa@kernel.org> (raw)
In-Reply-To: <20200421181337.988681-1-jolsa@kernel.org>
Adding support to use comments within the custom metric file
with both the shell '# ... ' and C '/* ... */ styles.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/expr.l | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l
index 5561c360cd27..99547182ef79 100644
--- a/tools/perf/util/expr.l
+++ b/tools/perf/util/expr.l
@@ -69,6 +69,8 @@ static int str(yyscan_t scanner, int token)
%}
%x custom
+%x comment_C
+%x comment_sh
number [0-9]+
@@ -103,6 +105,16 @@ else { return ELSE; }
#smt_on { return SMT_ON; }
{number} { return value(yyscanner, 10); }
{symbol} { return str(yyscanner, ID); }
+
+"/*" { BEGIN(comment_C); }
+<comment_C>"*/" { BEGIN(INITIAL); }
+<comment_C>\n { }
+<comment_C>. { }
+
+"#" { BEGIN(comment_sh); }
+<comment_sh>\n { BEGIN(INITIAL); }
+<comment_sh>. { }
+
"|" { return '|'; }
"^" { return '^'; }
"&" { return '&'; }
--
2.25.3
next prev parent reply other threads:[~2020-04-21 18:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 18:13 [PATCHv2 0/3] perf tools: Add support for user defined metric Jiri Olsa
2020-04-21 18:13 ` [PATCH 1/3] perf expr: Add parsing support for multiple expressions Jiri Olsa
2020-04-21 18:13 ` Jiri Olsa [this message]
2020-04-21 18:13 ` [PATCH 3/3] perf stat: Add --metrics-file option Jiri Olsa
2020-04-21 18:36 ` Andi Kleen
2020-04-21 18:52 ` Jiri Olsa
2020-04-21 20:06 ` Andi Kleen
2020-04-23 13:24 ` Jiri Olsa
2020-04-30 11:24 ` [PATCHv2 0/3] perf tools: Add support for user defined metric kajoljain
2020-04-30 12:43 ` 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=20200421181337.988681-3-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jmario@redhat.com \
--cc=john.garry@huawei.com \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
/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).