[PATCH 1/3] perf, tools: Handle events including .c and .o

From: Andi Kleen
Date: Wed Oct 05 2016 - 15:47:26 EST


From: Andi Kleen <ak@xxxxxxxxxxxxxxx>

This is a generic bug fix, but it helps with Sukadev's JSON event tree
where such events can happen.

Any event inclduing a .c/.o/.bpf currently triggers BPF compilation or loading
and then an error. This can happen for some Intel JSON events, which cannot
be used.

Fix the scanner to only match for .o or .c or .bpf at the end.
This will prevent loading multiple BPF scripts separated with comma,
but I assume this is acceptable.

Cc: wangnan0@xxxxxxxxxx
Cc: sukadev@xxxxxxxxxxxxxxxxxx
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
---
tools/perf/util/parse-events.l | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
index 9f43fda2570f..377147088a46 100644
--- a/tools/perf/util/parse-events.l
+++ b/tools/perf/util/parse-events.l
@@ -183,8 +183,8 @@ modifier_bp [rwx]{1,3}
}

{event_pmu} |
-{bpf_object} |
-{bpf_source} |
+({bpf_object}$) |
+({bpf_source}$) |
{event} {
BEGIN(INITIAL);
REWIND(1);
--
2.5.5