137 lines
4.4 KiB
Diff
137 lines
4.4 KiB
Diff
From d9408ff297274978db3e6905ef70a3d25fa4029a Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Mon, 25 May 2020 00:42:08 +0200
|
|
Subject: [PATCH 089/201] perf parse: Add 'struct parse_events_state' pointer
|
|
to scanner
|
|
|
|
mainline inclusion
|
|
from mainline-v5.8-rc1
|
|
commit 1244a32736f8f6a12e0959aa897813744122d690
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1244a32736f8f6a12e0959aa897813744122d690
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
We need to pass more data to the scanner so let's start with having it
|
|
to take pointer to 'struct parse_events_state' object instead of just
|
|
start token.
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Ian Rogers <irogers@google.com>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200524224219.234847-4-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
---
|
|
tools/perf/util/parse-events.c | 15 +++++++++------
|
|
tools/perf/util/parse-events.h | 1 +
|
|
tools/perf/util/parse-events.l | 8 ++++----
|
|
3 files changed, 14 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
|
|
index 8b9b13b6e901..67ae5069737b 100644
|
|
--- a/tools/perf/util/parse-events.c
|
|
+++ b/tools/perf/util/parse-events.c
|
|
@@ -24,7 +24,7 @@
|
|
#include "debug.h"
|
|
#include <api/fs/tracing_path.h>
|
|
#include "parse-events-bison.h"
|
|
-#define YY_EXTRA_TYPE int
|
|
+#define YY_EXTRA_TYPE void*
|
|
#include "parse-events-flex.h"
|
|
#include "pmu.h"
|
|
#include "thread_map.h"
|
|
@@ -1820,13 +1820,14 @@ perf_pmu__parse_check(const char *name)
|
|
return r ? r->type : PMU_EVENT_SYMBOL_ERR;
|
|
}
|
|
|
|
-static int parse_events__scanner(const char *str, void *parse_state, int start_token)
|
|
+static int parse_events__scanner(const char *str,
|
|
+ struct parse_events_state *parse_state)
|
|
{
|
|
YY_BUFFER_STATE buffer;
|
|
void *scanner;
|
|
int ret;
|
|
|
|
- ret = parse_events_lex_init_extra(start_token, &scanner);
|
|
+ ret = parse_events_lex_init_extra(parse_state, &scanner);
|
|
if (ret)
|
|
return ret;
|
|
|
|
@@ -1849,11 +1850,12 @@ static int parse_events__scanner(const char *str, void *parse_state, int start_t
|
|
int parse_events_terms(struct list_head *terms, const char *str)
|
|
{
|
|
struct parse_events_state parse_state = {
|
|
- .terms = NULL,
|
|
+ .terms = NULL,
|
|
+ .stoken = PE_START_TERMS,
|
|
};
|
|
int ret;
|
|
|
|
- ret = parse_events__scanner(str, &parse_state, PE_START_TERMS);
|
|
+ ret = parse_events__scanner(str, &parse_state);
|
|
if (!ret) {
|
|
list_splice(parse_state.terms, terms);
|
|
zfree(&parse_state.terms);
|
|
@@ -1872,10 +1874,11 @@ int parse_events(struct perf_evlist *evlist, const char *str,
|
|
.idx = evlist->nr_entries,
|
|
.error = err,
|
|
.evlist = evlist,
|
|
+ .stoken = PE_START_EVENTS,
|
|
};
|
|
int ret;
|
|
|
|
- ret = parse_events__scanner(str, &parse_state, PE_START_EVENTS);
|
|
+ ret = parse_events__scanner(str, &parse_state);
|
|
perf_pmu__parse_cleanup();
|
|
|
|
if (!ret && list_empty(&parse_state.list)) {
|
|
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
|
|
index 52be0b3b26f7..306f636aad96 100644
|
|
--- a/tools/perf/util/parse-events.h
|
|
+++ b/tools/perf/util/parse-events.h
|
|
@@ -119,6 +119,7 @@ struct parse_events_state {
|
|
struct parse_events_error *error;
|
|
struct perf_evlist *evlist;
|
|
struct list_head *terms;
|
|
+ int stoken;
|
|
};
|
|
|
|
void parse_events__shrink_config_terms(void);
|
|
diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l
|
|
index e7f00b5c123d..15ac319d94fa 100644
|
|
--- a/tools/perf/util/parse-events.l
|
|
+++ b/tools/perf/util/parse-events.l
|
|
@@ -209,10 +209,10 @@ modifier_bp [rwx]{1,3}
|
|
%%
|
|
|
|
%{
|
|
- {
|
|
- int start_token;
|
|
+ struct parse_events_state *_parse_state = parse_events_get_extra(yyscanner);
|
|
|
|
- start_token = parse_events_get_extra(yyscanner);
|
|
+ {
|
|
+ int start_token = _parse_state->stoken;
|
|
|
|
if (start_token == PE_START_TERMS)
|
|
BEGIN(config);
|
|
@@ -220,7 +220,7 @@ modifier_bp [rwx]{1,3}
|
|
BEGIN(event);
|
|
|
|
if (start_token) {
|
|
- parse_events_set_extra(NULL, yyscanner);
|
|
+ _parse_state->stoken = 0;
|
|
/*
|
|
* The flex parser does not init locations variable
|
|
* via the scan_string interface, so we need do the
|
|
--
|
|
2.27.0
|
|
|