Skip to content

Commit

Permalink
perf events parse: Rename parsing state struct to clearer name
Browse files Browse the repository at this point in the history 
Rename it from 'parse_events_evlist' to 'parse_events_state' to better
state that this is parsing state that has to be passed around.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-dursqtg2h2w98ztaa297u43x@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Aug 17, 2017
1 parent 07806a1 commit 5d369a7
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion tools/perf/tests/bpf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
struct perf_evlist *evlist;
int i, ret = TEST_FAIL, err = 0, count = 0;

struct parse_events_evlist parse_evlist;
struct parse_events_state parse_evlist;
struct parse_events_error parse_error;

bzero(&parse_error, sizeof(parse_error));
Expand Down
24 changes: 12 additions & 12 deletions tools/perf/util/parse-events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ static int add_tracepoint_multi_sys(struct list_head *list, int *idx,
}

struct __add_bpf_event_param {
struct parse_events_evlist *data;
struct parse_events_state *data;
struct list_head *list;
struct list_head *head_config;
};
Expand All @@ -599,16 +599,16 @@ static int add_bpf_event(const char *group, const char *event, int fd,
{
LIST_HEAD(new_evsels);
struct __add_bpf_event_param *param = _param;
struct parse_events_evlist *evlist = param->data;
struct parse_events_state *parse_state = param->data;
struct list_head *list = param->list;
struct perf_evsel *pos;
int err;

pr_debug("add bpf event %s:%s and attach bpf program %d\n",
group, event, fd);

err = parse_events_add_tracepoint(&new_evsels, &evlist->idx, group,
event, evlist->error,
err = parse_events_add_tracepoint(&new_evsels, &parse_state->idx, group,
event, parse_state->error,
param->head_config);
if (err) {
struct perf_evsel *evsel, *tmp;
Expand All @@ -632,7 +632,7 @@ static int add_bpf_event(const char *group, const char *event, int fd,
return 0;
}

int parse_events_load_bpf_obj(struct parse_events_evlist *data,
int parse_events_load_bpf_obj(struct parse_events_state *data,
struct list_head *list,
struct bpf_object *obj,
struct list_head *head_config)
Expand Down Expand Up @@ -686,7 +686,7 @@ int parse_events_load_bpf_obj(struct parse_events_evlist *data,
}

static int
parse_events_config_bpf(struct parse_events_evlist *data,
parse_events_config_bpf(struct parse_events_state *data,
struct bpf_object *obj,
struct list_head *head_config)
{
Expand Down Expand Up @@ -762,7 +762,7 @@ split_bpf_config_terms(struct list_head *evt_head_config,
list_move_tail(&term->list, obj_head_config);
}

int parse_events_load_bpf(struct parse_events_evlist *data,
int parse_events_load_bpf(struct parse_events_state *data,
struct list_head *list,
char *bpf_file_name,
bool source,
Expand Down Expand Up @@ -1184,7 +1184,7 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx,
err, head_config);
}

int parse_events_add_numeric(struct parse_events_evlist *data,
int parse_events_add_numeric(struct parse_events_state *data,
struct list_head *list,
u32 type, u64 config,
struct list_head *head_config)
Expand All @@ -1209,7 +1209,7 @@ int parse_events_add_numeric(struct parse_events_evlist *data,
get_config_name(head_config), &config_terms);
}

int parse_events_add_pmu(struct parse_events_evlist *data,
int parse_events_add_pmu(struct parse_events_state *data,
struct list_head *list, char *name,
struct list_head *head_config)
{
Expand Down Expand Up @@ -1267,7 +1267,7 @@ int parse_events_add_pmu(struct parse_events_evlist *data,
return evsel ? 0 : -ENOMEM;
}

int parse_events_multi_pmu_add(struct parse_events_evlist *data,
int parse_events_multi_pmu_add(struct parse_events_state *data,
char *str, struct list_head **listp)
{
struct list_head *head;
Expand Down Expand Up @@ -1675,7 +1675,7 @@ int parse_events_terms(struct list_head *terms, const char *str)
int parse_events(struct perf_evlist *evlist, const char *str,
struct parse_events_error *err)
{
struct parse_events_evlist data = {
struct parse_events_state data = {
.list = LIST_HEAD_INIT(data.list),
.idx = evlist->nr_entries,
.error = err,
Expand Down Expand Up @@ -2520,7 +2520,7 @@ void parse_events__clear_array(struct parse_events_array *a)
zfree(&a->ranges);
}

void parse_events_evlist_error(struct parse_events_evlist *data,
void parse_events_evlist_error(struct parse_events_state *data,
int idx, const char *str)
{
struct parse_events_error *err = data->error;
Expand Down
14 changes: 7 additions & 7 deletions tools/perf/util/parse-events.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ struct parse_events_error {
char *help; /* optional help string */
};

struct parse_events_evlist {
struct parse_events_state {
struct list_head list;
int idx;
int nr_groups;
Expand Down Expand Up @@ -143,18 +143,18 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx,
const char *sys, const char *event,
struct parse_events_error *error,
struct list_head *head_config);
int parse_events_load_bpf(struct parse_events_evlist *data,
int parse_events_load_bpf(struct parse_events_state *data,
struct list_head *list,
char *bpf_file_name,
bool source,
struct list_head *head_config);
/* Provide this function for perf test */
struct bpf_object;
int parse_events_load_bpf_obj(struct parse_events_evlist *data,
int parse_events_load_bpf_obj(struct parse_events_state *data,
struct list_head *list,
struct bpf_object *obj,
struct list_head *head_config);
int parse_events_add_numeric(struct parse_events_evlist *data,
int parse_events_add_numeric(struct parse_events_state *data,
struct list_head *list,
u32 type, u64 config,
struct list_head *head_config);
Expand All @@ -164,11 +164,11 @@ int parse_events_add_cache(struct list_head *list, int *idx,
struct list_head *head_config);
int parse_events_add_breakpoint(struct list_head *list, int *idx,
void *ptr, char *type, u64 len);
int parse_events_add_pmu(struct parse_events_evlist *data,
int parse_events_add_pmu(struct parse_events_state *data,
struct list_head *list, char *name,
struct list_head *head_config);

int parse_events_multi_pmu_add(struct parse_events_evlist *data,
int parse_events_multi_pmu_add(struct parse_events_state *data,
char *str,
struct list_head **listp);

Expand All @@ -180,7 +180,7 @@ perf_pmu__parse_check(const char *name);
void parse_events__set_leader(char *name, struct list_head *list);
void parse_events_update_lists(struct list_head *list_event,
struct list_head *list_all);
void parse_events_evlist_error(struct parse_events_evlist *data,
void parse_events_evlist_error(struct parse_events_state *data,
int idx, const char *str);

void print_events(const char *event_glob, bool name_only, bool quiet,
Expand Down
22 changes: 11 additions & 11 deletions tools/perf/util/parse-events.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ do { \
} while (0)

static void inc_group_count(struct list_head *list,
struct parse_events_evlist *data)
struct parse_events_state *data)
{
/* Count groups only have more than 1 members */
if (!list_is_last(list->next, list))
Expand Down Expand Up @@ -115,7 +115,7 @@ PE_START_TERMS start_terms

start_events: groups
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;

parse_events_update_lists($1, &data->list);
}
Expand Down Expand Up @@ -309,7 +309,7 @@ value_sym sep_slash_dc
event_legacy_cache:
PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT opt_event_config
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;
struct parse_events_error *error = data->error;
struct list_head *list;

Expand All @@ -321,7 +321,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT opt_e
|
PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT opt_event_config
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;
struct parse_events_error *error = data->error;
struct list_head *list;

Expand All @@ -333,7 +333,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT opt_event_config
|
PE_NAME_CACHE_TYPE opt_event_config
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;
struct parse_events_error *error = data->error;
struct list_head *list;

Expand All @@ -346,7 +346,7 @@ PE_NAME_CACHE_TYPE opt_event_config
event_legacy_mem:
PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;
struct list_head *list;

ALLOC_LIST(list);
Expand All @@ -357,7 +357,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc
|
PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;
struct list_head *list;

ALLOC_LIST(list);
Expand All @@ -368,7 +368,7 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc
|
PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;
struct list_head *list;

ALLOC_LIST(list);
Expand All @@ -379,7 +379,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc
|
PE_PREFIX_MEM PE_VALUE sep_dc
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;
struct list_head *list;

ALLOC_LIST(list);
Expand All @@ -391,7 +391,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc
event_legacy_tracepoint:
tracepoint_name opt_event_config
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;
struct parse_events_error *error = data->error;
struct list_head *list;

Expand Down Expand Up @@ -451,7 +451,7 @@ PE_RAW opt_event_config
event_bpf_file:
PE_BPF_OBJECT opt_event_config
{
struct parse_events_evlist *data = _data;
struct parse_events_state *data = _data;
struct parse_events_error *error = data->error;
struct list_head *list;

Expand Down

0 comments on commit 5d369a7

Please sign in to comment.