perf tools: Rename and move pmu_event_name to get_config_name

Following commits will make more events obey /name=newname/ options.
This patch makes pmu_event_name() a generic helper.

Makes new get_config_name() accept NULL input to make life easier.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Cody P Schafer <dev@codyps.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jeremie Galarneau <jeremie.galarneau@efficios.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kirill Smelkov <kirr@nexedi.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1455882283-79592-12-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Wang Nan 2016-02-19 11:43:59 +00:00 коммит произвёл Arnaldo Carvalho de Melo
Родитель 1669e509ea
Коммит e814fddde1
1 изменённых файлов: 18 добавлений и 17 удалений

Просмотреть файл

@ -279,7 +279,24 @@ const char *event_type(int type)
return "unknown"; return "unknown";
} }
static int parse_events__is_name_term(struct parse_events_term *term)
{
return term->type_term == PARSE_EVENTS__TERM_TYPE_NAME;
}
static char *get_config_name(struct list_head *head_terms)
{
struct parse_events_term *term;
if (!head_terms)
return NULL;
list_for_each_entry(term, head_terms, list)
if (parse_events__is_name_term(term))
return term->val.str;
return NULL;
}
static struct perf_evsel * static struct perf_evsel *
__add_event(struct list_head *list, int *idx, __add_event(struct list_head *list, int *idx,
@ -1029,22 +1046,6 @@ int parse_events_add_numeric(struct parse_events_evlist *data,
return add_event(list, &data->idx, &attr, NULL, &config_terms); return add_event(list, &data->idx, &attr, NULL, &config_terms);
} }
static int parse_events__is_name_term(struct parse_events_term *term)
{
return term->type_term == PARSE_EVENTS__TERM_TYPE_NAME;
}
static char *pmu_event_name(struct list_head *head_terms)
{
struct parse_events_term *term;
list_for_each_entry(term, head_terms, list)
if (parse_events__is_name_term(term))
return term->val.str;
return NULL;
}
int parse_events_add_pmu(struct parse_events_evlist *data, int parse_events_add_pmu(struct parse_events_evlist *data,
struct list_head *list, char *name, struct list_head *list, char *name,
struct list_head *head_config) struct list_head *head_config)
@ -1089,7 +1090,7 @@ int parse_events_add_pmu(struct parse_events_evlist *data,
return -EINVAL; return -EINVAL;
evsel = __add_event(list, &data->idx, &attr, evsel = __add_event(list, &data->idx, &attr,
pmu_event_name(head_config), pmu->cpus, get_config_name(head_config), pmu->cpus,
&config_terms); &config_terms);
if (evsel) { if (evsel) {
evsel->unit = info.unit; evsel->unit = info.unit;