system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-01 17:00:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf tools: Move new_term arguments into struct parse_events_term template

Browse source 
We need to add yet another parameter to new_term function in following
patch, so it's better to move first all the current params into template
struct parse_events_term and use it as a single argument.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1487340058-10496-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2017-02-17 15:00:55 +01:00 committed by Arnaldo Carvalho de Melo
parent 85e0d50965
commit 67b49b38f7
1 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
tools/perf/util/parse-events.c
View file

@ -2318,24 +2318,20 @@ int parse_events__is_hardcoded_term(struct parse_events_term *term)
return term->type_term != PARSE_EVENTS__TERM_TYPE_USER; return term->type_term != PARSE_EVENTS__TERM_TYPE_USER;
} }
static int new_term(struct parse_events_term **_term, int type_val, static int new_term(struct parse_events_term **_term,
int type_term, char *config, struct parse_events_term *temp,
char *str, u64 num, int err_term, int err_val) char *str, u64 num)
{ {
struct parse_events_term *term; struct parse_events_term *term;
term = zalloc(sizeof(*term)); term = malloc(sizeof(*term));
if (!term) if (!term)
return -ENOMEM; return -ENOMEM;
*term = *temp;
INIT_LIST_HEAD(&term->list); INIT_LIST_HEAD(&term->list);
term->type_val = type_val;
term->type_term = type_term;
term->config = config;
term->err_term = err_term;
term->err_val = err_val;
switch (type_val) { switch (term->type_val) {
case PARSE_EVENTS__TERM_TYPE_NUM: case PARSE_EVENTS__TERM_TYPE_NUM:
term->val.num = num; term->val.num = num;
break; break;
@ -2358,10 +2354,15 @@ int parse_events_term__num(struct parse_events_term **term,
YYLTYPE *loc_term = loc_term_; YYLTYPE *loc_term = loc_term_;
YYLTYPE *loc_val = loc_val_; YYLTYPE *loc_val = loc_val_;
return new_term(term, PARSE_EVENTS__TERM_TYPE_NUM, type_term, struct parse_events_term temp = {
config, NULL, num, .type_val = PARSE_EVENTS__TERM_TYPE_NUM,
loc_term ? loc_term->first_column : 0, .type_term = type_term,
loc_val ? loc_val->first_column : 0); .config = config,
.err_term = loc_term ? loc_term->first_column : 0,
.err_val = loc_val ? loc_val->first_column : 0,
};
return new_term(term, &temp, NULL, num);
} }
int parse_events_term__str(struct parse_events_term **term, int parse_events_term__str(struct parse_events_term **term,
@ -2371,37 +2372,45 @@ int parse_events_term__str(struct parse_events_term **term,
YYLTYPE *loc_term = loc_term_; YYLTYPE *loc_term = loc_term_;
YYLTYPE *loc_val = loc_val_; YYLTYPE *loc_val = loc_val_;
return new_term(term, PARSE_EVENTS__TERM_TYPE_STR, type_term, struct parse_events_term temp = {
config, str, 0, .type_val = PARSE_EVENTS__TERM_TYPE_STR,
loc_term ? loc_term->first_column : 0, .type_term = type_term,
loc_val ? loc_val->first_column : 0); .config = config,
.err_term = loc_term ? loc_term->first_column : 0,
.err_val = loc_val ? loc_val->first_column : 0,
};
return new_term(term, &temp, str, 0);
} }
int parse_events_term__sym_hw(struct parse_events_term **term, int parse_events_term__sym_hw(struct parse_events_term **term,
char *config, unsigned idx) char *config, unsigned idx)
{ {
struct event_symbol *sym; struct event_symbol *sym;
struct parse_events_term temp = {
.type_val = PARSE_EVENTS__TERM_TYPE_STR,
.type_term = PARSE_EVENTS__TERM_TYPE_USER,
.config = config ?: (char *) "event",
};
BUG_ON(idx >= PERF_COUNT_HW_MAX); BUG_ON(idx >= PERF_COUNT_HW_MAX);
sym = &event_symbols_hw[idx]; sym = &event_symbols_hw[idx];
if (config) return new_term(term, &temp, (char *) sym->symbol, 0);
return new_term(term, PARSE_EVENTS__TERM_TYPE_STR,
PARSE_EVENTS__TERM_TYPE_USER, config,
(char *) sym->symbol, 0, 0, 0);
else
return new_term(term, PARSE_EVENTS__TERM_TYPE_STR,
PARSE_EVENTS__TERM_TYPE_USER,
(char *) "event", (char *) sym->symbol,
0, 0, 0);
} }
int parse_events_term__clone(struct parse_events_term **new, int parse_events_term__clone(struct parse_events_term **new,
struct parse_events_term *term) struct parse_events_term *term)
{ {
return new_term(new, term->type_val, term->type_term, term->config, struct parse_events_term temp = {
term->val.str, term->val.num, .type_val = term->type_val,
term->err_term, term->err_val); .type_term = term->type_term,
.config = term->config,
.err_term = term->err_term,
.err_val = term->err_val,
};
return new_term(new, &temp, term->val.str, term->val.num);
} }
void parse_events_terms__purge(struct list_head *terms) void parse_events_terms__purge(struct list_head *terms)