Skip to contentSkip to conversation

perf parse-events: Fix driver config term

PATCH Applied Ian Rogers 3 participants 5 messages Sep 5, 2023 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf parse-events: Fix driver config term

Inadvertently deleted in commit 30f4ade33d64 ("perf tools: Revert enable indices setting syntax for BPF map").

---
 tools/perf/util/parse-events.y | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
tools/perf/util/parse-events.y +17 -0
index 4a305df61f74..21bfe7e0d944 100644
@@ -839,6 +839,23 @@ PE_TERM
 
 	$$ = term;
 }
+|
+PE_DRV_CFG_TERM
+{
+	struct parse_events_term *term;
+	char *config = strdup($1);
+	int err;
+
+	if (!config)
+		YYNOMEM;
+	err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL);
+	if (err) {
+		free($1);
+		free(config);
+		PE_ABORT(err);
+	}
+	$$ = term;
+}
 
 sep_dc: ':' |
 
Signature · 1 line
2.42.0.283.g2d96d420d3-goog
author reviewer
#1 lore raw
Quoted 4 lines · Ian Rogers

Inadvertently deleted in commit 30f4ade33d64 ("perf tools: Revert enable indices setting syntax for BPF map").

Sorry, should also have:

Fixes 30f4ade33d64 ("perf tools: Revert enable indices setting syntax

for BPF map")

Thanks,
Ian

Quoted 37 lines
---
 tools/perf/util/parse-events.y | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
tools/perf/util/parse-events.y +17 -1
index 4a305df61f74..21bfe7e0d944 100644
@@ -839,6 +839,23 @@ PE_TERM
 
        $$ = term;
 }
+|
+PE_DRV_CFG_TERM
+{
+       struct parse_events_term *term;
+       char *config = strdup($1);
+       int err;
+
+       if (!config)
+               YYNOMEM;
+       err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL);
+       if (err) {
+               free($1);
+               free(config);
+               PE_ABORT(err);
+       }
+       $$ = term;
+}
 
 sep_dc: ':' |
 
--

2.42.0.283.g2d96d420d3-goog

#2 lore raw

Em Mon, Sep 04, 2023 at 08:51:37PM -0700, Ian Rogers escreveu:

Quoted 9 lines · Ian Rogers
Quoted 4 lines

Inadvertently deleted in commit 30f4ade33d64 ("perf tools: Revert enable indices setting syntax for BPF map").

Sorry, should also have:

Fixes 30f4ade33d64 ("perf tools: Revert enable indices setting syntax

for BPF map")

I added it, thanks.

Quoted 40 lines

Thanks,
Ian

Quoted 37 lines
---
 tools/perf/util/parse-events.y | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
tools/perf/util/parse-events.y +17 -1
index 4a305df61f74..21bfe7e0d944 100644
@@ -839,6 +839,23 @@ PE_TERM
 
        $$ = term;
 }
+|
+PE_DRV_CFG_TERM
+{
+       struct parse_events_term *term;
+       char *config = strdup($1);
+       int err;
+
+       if (!config)
+               YYNOMEM;
+       err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL);
+       if (err) {
+               free($1);
+               free(config);
+               PE_ABORT(err);
+       }
+       $$ = term;
+}
 
 sep_dc: ':' |
 
--

2.42.0.283.g2d96d420d3-goog

Signature · 1 line
- Arnaldo
Reviewed-by on v1 1/1
#3 lore raw
In reply to Ian Rogers
Quoted 27 lines · Ian Rogers

Inadvertently deleted in commit 30f4ade33d64 ("perf tools: Revert enable indices setting syntax for BPF map").

---
 tools/perf/util/parse-events.y | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
tools/perf/util/parse-events.y +10 -0
index 4a305df61f74..21bfe7e0d944 100644
@@ -839,6 +839,23 @@ PE_TERM
 
 	$$ = term;
 }
+|
+PE_DRV_CFG_TERM
+{
+	struct parse_events_term *term;
+	char *config = strdup($1);
+	int err;
+
+	if (!config)
+		YYNOMEM;
+	err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL);

tools/perf/util/parse-events.y PE_TERM · line 861

Quoted 10 lines
tools/perf/util/parse-events.y +7 -0
+	if (err) {
+		free($1);
+		free(config);
+		PE_ABORT(err);
+	}
+	$$ = term;
+}
 
 sep_dc: ':' |
 
maintainer Applied
#4 lore raw

Em Tue, Sep 05, 2023 at 09:40:30AM +0100, James Clark escreveu:

Quoted 38 lines · Ian Rogers
Quoted 35 lines

Inadvertently deleted in commit 30f4ade33d64 ("perf tools: Revert enable indices setting syntax for BPF map").

---
 tools/perf/util/parse-events.y | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
tools/perf/util/parse-events.y +17 -0
index 4a305df61f74..21bfe7e0d944 100644
@@ -839,6 +839,23 @@ PE_TERM
 
 	$$ = term;
 }
+|
+PE_DRV_CFG_TERM
+{
+	struct parse_events_term *term;
+	char *config = strdup($1);
+	int err;
+
+	if (!config)
+		YYNOMEM;
+	err = parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, config, $1, &@1, NULL);
+	if (err) {
+		free($1);
+		free(config);
+		PE_ABORT(err);
+	}
+	$$ = term;
+}
 
Quoted 4 lines

tools/perf/util/parse-events.y PE_TERM · line 861

Quoted 2 lines
tools/perf/util/parse-events.y +0 -0
 sep_dc: ':' |
 

Thanks, applied.

- Arnaldo