[PATCH 7/9] perf tools: Add static terms support for parse_events_error

Jiri Olsa
2015-04-22T19:17:47Z

Allowing static terms like 'name,period,config,config1..' processing
to report back error.

$ perf record -e 'cpu/event=1,name=1/' ls
event syntax error: '..=1,name=1/'
\___ expected string value

$ perf record -e 'cpu/event=1,period=krava/' ls
event syntax error: '..,period=krava/'
\___ expected numeric value

$ perf record -e 'cpu/config=krava1/' ls
event syntax error: '../config=krava1/'
\___ expected numeric value

Link: http://lkml.kernel.org/n/tip-dvkdtxlkbmdbl1b22fic4jut@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/parse-events.c | 37 ++++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 9c2e1aece477..73f6bb65e310 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -545,13 +545,31 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx,
return add_event(list, idx, &attr, NULL);
}

+static int check_type_val(struct parse_events_term *term,
+ struct parse_events_error *error,
+ int type)
+{
+ if (type == term->type_val)
+ return 0;
+
+ if (error) {
+ error->idx = term->err_val;
+ if (type == PARSE_EVENTS__TERM_TYPE_NUM)
+ error->str = strdup("expected numeric value");
+ else
+ error->str = strdup("expected string value");
+ }
+ return -EINVAL;
+}
+
static int config_term(struct perf_event_attr *attr,
- struct parse_events_term *term)
+ struct parse_events_term *term,
+ struct parse_events_error *error)
{
-#define CHECK_TYPE_VAL(type) \
-do { \
- if (PARSE_EVENTS__TERM_TYPE_ ## type != term->type_val) \
- return -EINVAL; \
+#define CHECK_TYPE_VAL(type) \
+do { \
+ if (check_type_val(term, error, PARSE_EVENTS__TERM_TYPE_ ## type)) \
+ return -EINVAL; \
} while (0)

switch (term->type_term) {
@@ -595,12 +613,13 @@ do { \
}

static int config_attr(struct perf_event_attr *attr,
- struct list_head *head)
+ struct list_head *head,
+ struct parse_events_error *error)
{
struct parse_events_term *term;

list_for_each_entry(term, head, list)
- if (config_term(attr, term))
+ if (config_term(attr, term, error))
return -EINVAL;

return 0;
@@ -617,7 +636,7 @@ int parse_events_add_numeric(struct list_head *list, int *idx,
attr.config = config;

if (head_config &&
- config_attr(&attr, head_config))
+ config_attr(&attr, head_config, NULL))
return -EINVAL;

return add_event(list, idx, &attr, NULL);
@@ -672,7 +691,7 @@ int parse_events_add_pmu(struct parse_events_evlist *data,
* Configure hardcoded terms first, no need to check
* return value when called with fail == 0 ;)
*/
- if (config_attr(&attr, head_config))
+ if (config_attr(&attr, head_config, data->error))
return -EINVAL;

if (perf_pmu__config(pmu, &attr, head_config, data->error))
--
1.9.3