perf pmu: Make parser reentrant
Ian Rogers
reviewerPATCH 1/1 perf pmu: Make parser reentrant
By default bison uses global state for compatibility with yacc. Make the parser reentrant so that it may be used in asynchronous and multithreaded situations.
--- tools/perf/util/pmu.c | 17 ++++++++++++----- tools/perf/util/pmu.h | 2 +- tools/perf/util/pmu.l | 17 ++++++++++++----- tools/perf/util/pmu.y | 5 ++++- 4 files changed, 29 insertions(+), 12 deletions(-)
tools/perf/util/pmu.c +12 -5
@@ -24,6 +24,8 @@#include "evsel.h" #include "pmu.h" #include "pmus.h" +#include "pmu-bison.h" +#include "pmu-flex.h" #include "parse-events.h" #include "print-events.h" #include "header.h"
@@ -57,9 +59,6 @@ struct perf_pmu_format {struct list_head list; }; -int perf_pmu_parse (struct list_head *list,char *name); -extern FILE *perf_pmu_in; -static bool hybrid_scanned;/*
@@ -79,6 +78,7 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)while (!ret && (evt_ent =readdir (format_dir))) {char path[PATH_MAX ];char *name = evt_ent->d_name; +void *scanner;FILE *file;if (!strcmp (name,"." ) || !strcmp (name,".." ))
@@ -91,8 +91,15 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)if (!file)break ; - perf_pmu_in = file; - ret =perf_pmu_parse (head, name); + ret =perf_pmu_lex_init (&scanner); +if (ret) { +fclose (file); +break ; + } + +perf_pmu_set_in (file, scanner); + ret =perf_pmu_parse (head, name, scanner); +perf_pmu_lex_destroy (scanner);fclose (file); }
tools/perf/util/pmu.h +1 -1
@@ -206,7 +206,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms, struct perf_pmu_info *info);struct list_head *perf_pmu__alias (struct perf_pmu *pmu,struct list_head *head_terms); -void perf_pmu_error (struct list_head *list,char *name,char const *msg); +void perf_pmu_error (struct list_head *list,char *name,void *scanner,char const *msg);int perf_pmu__new_format (struct list_head *list,char *name,int config,unsigned long *bits);
tools/perf/util/pmu.l +12 -5
@@ -1,4 +1,6 @@ %option prefix="perf_pmu_" +%option reentrant +%option bison-bridge %{ #include <stdlib.h>
@@ -6,16 +8,21 @@ #include "pmu.h" #include "pmu-bison.h" -static int value(int base) +char *perf_pmu_get_text(yyscan_t yyscanner); +YYSTYPE *perf_pmu_get_lval(yyscan_t yyscanner); + +static int value(yyscan_t scanner, int base) { + YYSTYPE *yylval = perf_pmu_get_lval(scanner); + char *text = perf_pmu_get_text(scanner); long num; errno = 0; - num = strtoul(perf_pmu_text, NULL, base); + num = strtoul(text, NULL, base); if (errno) return PP_ERROR; - perf_pmu_lval.num = num; + yylval->num = num; return PP_VALUE; }
@@ -25,7 +32,7 @@ num_dec [0-9]+ %% -{num_dec} { return value(10); } +{num_dec} { return value(yyscanner, 10); } config { return PP_CONFIG; } - { return '-'; } : { return ':'; }
@@ -35,7 +42,7 @@ config { return PP_CONFIG; } %% -int perf_pmu_wrap(void) +int perf_pmu_wrap(void *scanner __maybe_unused) { return 1; }
tools/perf/util/pmu.y +4 -1
@@ -1,6 +1,8 @@ - +%define api.pure full %parse-param {struct list_head *format} %parse-param {char *name} +%parse-param {void *scanner} +%lex-param {void* scanner} %{
@@ -78,6 +80,7 @@ PP_VALUE void perf_pmu_error(struct list_head *list __maybe_unused, char *name __maybe_unused, + void *scanner __maybe_unused, char const *msg __maybe_unused) { }
Signature · 1 line
2.40.0.348.gf938b09366-goog
Quoted 5 lines · Ian Rogers
By default bison uses global state for compatibility with yacc. Make the parser reentrant so that it may be used in asynchronous and multithreaded situations.
Signed-off-by Ian Rogers <[email protected]>
jirka
Quoted 148 lines
--- tools/perf/util/pmu.c | 17 ++++++++++++----- tools/perf/util/pmu.h | 2 +- tools/perf/util/pmu.l | 17 ++++++++++++----- tools/perf/util/pmu.y | 5 ++++- 4 files changed, 29 insertions(+), 12 deletions(-)tools/perf/util/pmu.c +12
-5@@ -24,6 +24,8 @@#include "evsel.h" #include "pmu.h" #include "pmus.h" +#include "pmu-bison.h" +#include "pmu-flex.h" #include "parse-events.h" #include "print-events.h" #include "header.h" @@ -57,9 +59,6 @@ struct perf_pmu_format {struct list_head list; }; -int perf_pmu_parse (struct list_head *list,char *name); -extern FILE *perf_pmu_in; -static bool hybrid_scanned;/* @@ -79,6 +78,7 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)while (!ret && (evt_ent =readdir (format_dir))) {char path[PATH_MAX ];char *name = evt_ent->d_name; +void *scanner;FILE *file;if (!strcmp (name,"." ) || !strcmp (name,".." ))@@ -91,8 +91,15 @@ int perf_pmu__format_parse(char *dir, struct list_head *head)if (!file)break ; - perf_pmu_in = file; - ret =perf_pmu_parse (head, name); + ret =perf_pmu_lex_init (&scanner); +if (ret) { +fclose (file); +break ; + } + +perf_pmu_set_in (file, scanner); + ret =perf_pmu_parse (head, name, scanner); +perf_pmu_lex_destroy (scanner);fclose (file); }tools/perf/util/pmu.h +1
-1@@ -206,7 +206,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms, struct perf_pmu_info *info);struct list_head *perf_pmu__alias (struct perf_pmu *pmu,struct list_head *head_terms); -void perf_pmu_error (struct list_head *list,char *name,char const *msg); +void perf_pmu_error (struct list_head *list,char *name,void *scanner,char const *msg);int perf_pmu__new_format (struct list_head *list,char *name,int config,unsigned long *bits);tools/perf/util/pmu.l +12
-5@@ -1,4 +1,6 @@ %option prefix="perf_pmu_" +%option reentrant +%option bison-bridge %{ #include <stdlib.h>@@ -6,16 +8,21 @@ #include "pmu.h" #include "pmu-bison.h" -static int value(int base) +char *perf_pmu_get_text(yyscan_t yyscanner); +YYSTYPE *perf_pmu_get_lval(yyscan_t yyscanner); + +static int value(yyscan_t scanner, int base) { + YYSTYPE *yylval = perf_pmu_get_lval(scanner); + char *text = perf_pmu_get_text(scanner); long num; errno = 0; - num = strtoul(perf_pmu_text, NULL, base); + num = strtoul(text, NULL, base); if (errno) return PP_ERROR; - perf_pmu_lval.num = num; + yylval->num = num; return PP_VALUE; }@@ -25,7 +32,7 @@ num_dec [0-9]+ %% -{num_dec} { return value(10); } +{num_dec} { return value(yyscanner, 10); } config { return PP_CONFIG; } - { return '-'; } : { return ':'; }@@ -35,7 +42,7 @@ config { return PP_CONFIG; } %% -int perf_pmu_wrap(void) +int perf_pmu_wrap(void *scanner __maybe_unused) { return 1; }tools/perf/util/pmu.y +4
-1@@ -1,6 +1,8 @@ - +%define api.pure full %parse-param {struct list_head *format} %parse-param {char *name} +%parse-param {void *scanner} +%lex-param {void* scanner} %{@@ -78,6 +80,7 @@ PP_VALUE void perf_pmu_error(struct list_head *list __maybe_unused, char *name __maybe_unused, + void *scanner __maybe_unused, char const *msg __maybe_unused) { }Signature · 1 line
2.40.0.348.gf938b09366-goog
Arnaldo Carvalho de Melo
maintainerEm Tue, Apr 04, 2023 at 09:38:32AM +0200, Jiri Olsa escreveu:
Quoted 8 lines · Ian Rogers
Quoted 5 lines
By default bison uses global state for compatibility with yacc. Make the parser reentrant so that it may be used in asynchronous and multithreaded situations.
Signed-off-by Ian Rogers <[email protected]>Acked-by Jiri Olsa <[email protected]>
So this clashed with Namhyung's recent series, please update it using what is in tmp.perf-tools-next.
- Arnaldo
Ian Rogers
reviewerQuoted 7 lines · Arnaldo Carvalho de Melo
Em Tue, Apr 04, 2023 at 09:38:32AM +0200, Jiri Olsa escreveu:
Quoted 5 lines · Ian Rogers
Quoted 4 lines
By default bison uses global state for compatibility with yacc. Make the parser reentrant so that it may be used in asynchronous and multithreaded situations.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Ian Rogers <[email protected]>Acked-by Jiri Olsa <[email protected]>So this clashed with Namhyung's recent series, please update it using what is in tmp.perf-tools-next.
- Arnaldo
I dealt with the merge conflict in v2 [1]. I didn't add Jiri's acked-by just because there was a small change in perf_pmu__format_parse.
Thanks,
Ian