Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1447946
| From | Jiri Olsa <jolsa@redhat.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH V2 3/6] perf tools: add infrastructure for PMU specific configuration |
| Date | 2016-07-21 17:00 +0200 |
| Message-ID | <rXnCb-kD-37@gated-at.bofh.it> (permalink) |
| References | <rX6rD-6b4-5@gated-at.bofh.it> <rX6rD-6b4-7@gated-at.bofh.it> <rXgU1-4ur-9@gated-at.bofh.it> <rXnsu-gG-21@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Thu, Jul 21, 2016 at 08:44:53AM -0600, Mathieu Poirier wrote:
SNIP
> >> diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
> >> index 7a2519435da0..1f7e11a6c5b3 100644
> >> --- a/tools/perf/util/parse-events.l
> >> +++ b/tools/perf/util/parse-events.l
> >> @@ -53,6 +53,16 @@ static int str(yyscan_t scanner, int token)
> >> return token;
> >> }
> >>
> >> +static int drv_str(yyscan_t scanner, int token)
> >> +{
> >> + YYSTYPE *yylval = parse_events_get_lval(scanner);
> >> + char *text = parse_events_get_text(scanner);
> >> +
> >> + /* Strip off the '@' */
> >> + yylval->str = strdup(text + 1);
> >> + return token;
> >> +}
> >
> > why don't let bison parse this with rule like:
> >
> > | '@' PE_DRV_CFG_TERM
> > {
> > ...
> > }
> >
> >
> > you could omit the drv_str function then
>
> I simply thought it was simple and clean to do it that way - and it
> follows the trend already in place. Are you sure you want me to move
> this to bison? Either way we have to add code...
>
> Many thanks for the review,
> Mathieu
hum, i might be missing something, but what I meant
was something like below
thanks,
jirka
---
diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index 1f7e11a6c5b3..9b00f9b9caa2 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -53,16 +53,6 @@ static int str(yyscan_t scanner, int token)
return token;
}
-static int drv_str(yyscan_t scanner, int token)
-{
- YYSTYPE *yylval = parse_events_get_lval(scanner);
- char *text = parse_events_get_text(scanner);
-
- /* Strip off the '@' */
- yylval->str = strdup(text + 1);
- return token;
-}
-
#define REWIND(__alloc) \
do { \
YYSTYPE *__yylval = parse_events_get_lval(yyscanner); \
@@ -220,7 +210,7 @@ no-overwrite { return term(yyscanner, PARSE_EVENTS__TERM_TYPE_NOOVERWRITE); }
{name_minus} { return str(yyscanner, PE_NAME); }
\[all\] { return PE_ARRAY_ALL; }
"[" { BEGIN(array); return '['; }
-@{drv_cfg_term} { return drv_str(yyscanner, PE_DRV_CFG_TERM); }
+{drv_cfg_term} { return PE_DRV_CFG_TERM; }
}
<mem>{
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 879115f93edc..b7af1b834fda 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -602,12 +602,12 @@ PE_NAME array '=' PE_VALUE
$$ = term;
}
|
-PE_DRV_CFG_TERM
+'@' PE_DRV_CFG_TERM
{
struct parse_events_term *term;
ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG,
- $1, $1, &@1, NULL));
+ $2, $2, &@2, NULL));
$$ = term;
}
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH V2 3/6] perf tools: add infrastructure for PMU specific configuration Mathieu Poirier <mathieu.poirier@linaro.org> - 2016-07-20 22:40 +0200
Re: [PATCH V2 3/6] perf tools: add infrastructure for PMU specific configuration Jiri Olsa <jolsa@redhat.com> - 2016-07-21 09:50 +0200
Re: [PATCH V2 3/6] perf tools: add infrastructure for PMU specific configuration Mathieu Poirier <mathieu.poirier@linaro.org> - 2016-07-21 16:50 +0200
Re: [PATCH V2 3/6] perf tools: add infrastructure for PMU specific configuration Jiri Olsa <jolsa@redhat.com> - 2016-07-21 17:00 +0200
Re: [PATCH V2 3/6] perf tools: add infrastructure for PMU specific configuration Mathieu Poirier <mathieu.poirier@linaro.org> - 2016-07-21 18:00 +0200
Re: [PATCH V2 3/6] perf tools: add infrastructure for PMU specific configuration Mathieu Poirier <mathieu.poirier@linaro.org> - 2016-07-22 20:30 +0200
Re: [PATCH V2 3/6] perf tools: add infrastructure for PMU specific configuration Jiri Olsa <jolsa@redhat.com> - 2016-07-21 09:50 +0200
Re: [PATCH V2 3/6] perf tools: add infrastructure for PMU specific configuration Jiri Olsa <jolsa@redhat.com> - 2016-07-21 09:50 +0200
csiph-web