Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-27 15:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf tools: Fix usage of __ in event parsing struct names

Browse Source 
In tools/perf we use a convention where __ separates the struct name
from the function name for functions that operate on a struct instance.

Fix this usage by removing it from the struct names and fix also the
associated functions.

Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-kdcoh7uitivx68otqcz12aaz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2013-01-18 16:56:57 -03:00
parent 7c3102b843
commit 23b6339b91
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/perf/tests/parse-events.c
View File

@ -840,13 +840,13 @@ static int test__all_tracepoints(struct perf_evlist *evlist)
return test__checkevent_tracepoint_multi(evlist); return test__checkevent_tracepoint_multi(evlist);
} }
struct test__event_st { struct evlist_test {
const char *name; const char *name;
__u32 type; __u32 type;
int (*check)(struct perf_evlist *evlist); int (*check)(struct perf_evlist *evlist);
}; };
static struct test__event_st test__events[] = { static struct evlist_test test__events[] = {
[0] = { [0] = {
.name = "syscalls:sys_enter_open", .name = "syscalls:sys_enter_open",
.check = test__checkevent_tracepoint, .check = test__checkevent_tracepoint,
@ -985,7 +985,7 @@ static struct test__event_st test__events[] = {
}, },
}; };
static struct test__event_st test__events_pmu[] = { static struct evlist_test test__events_pmu[] = {
[0] = { [0] = {
.name = "cpu/config=10,config1,config2=3,period=1000/u", .name = "cpu/config=10,config1,config2=3,period=1000/u",
.check = test__checkevent_pmu, .check = test__checkevent_pmu,
@ -996,20 +996,20 @@ static struct test__event_st test__events_pmu[] = {
}, },
}; };
struct test__term { struct terms_test {
const char *str; const char *str;
__u32 type; __u32 type;
int (*check)(struct list_head *terms); int (*check)(struct list_head *terms);
}; };
static struct test__term test__terms[] = { static struct terms_test test__terms[] = {
[0] = { [0] = {
.str = "config=10,config1,config2=3,umask=1", .str = "config=10,config1,config2=3,umask=1",
.check = test__checkterms_simple, .check = test__checkterms_simple,
}, },
}; };
static int test_event(struct test__event_st *e) static int test_event(struct evlist_test *e)
{ {
struct perf_evlist *evlist; struct perf_evlist *evlist;
int ret; int ret;
@ -1031,13 +1031,13 @@ static int test_event(struct test__event_st *e)
return ret; return ret;
} }
static int test_events(struct test__event_st *events, unsigned cnt) static int test_events(struct evlist_test *events, unsigned cnt)
{ {
int ret1, ret2 = 0; int ret1, ret2 = 0;
unsigned i; unsigned i;
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
struct test__event_st *e = &events[i]; struct evlist_test *e = &events[i];
pr_debug("running test %d '%s'\n", i, e->name); pr_debug("running test %d '%s'\n", i, e->name);
ret1 = test_event(e); ret1 = test_event(e);
@ -1048,7 +1048,7 @@ static int test_events(struct test__event_st *events, unsigned cnt)
return ret2; return ret2;
} }
static int test_term(struct test__term *t) static int test_term(struct terms_test *t)
{ {
struct list_head *terms; struct list_head *terms;
int ret; int ret;
@ -1072,13 +1072,13 @@ static int test_term(struct test__term *t)
return ret; return ret;
} }
static int test_terms(struct test__term *terms, unsigned cnt) static int test_terms(struct terms_test *terms, unsigned cnt)
{ {
int ret = 0; int ret = 0;
unsigned i; unsigned i;
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
struct test__term *t = &terms[i]; struct terms_test *t = &terms[i];
pr_debug("running test %d '%s'\n", i, t->str); pr_debug("running test %d '%s'\n", i, t->str);
ret = test_term(t); ret = test_term(t);
@ -1129,7 +1129,7 @@ static int test_pmu_events(void)
while (!ret && (ent = readdir(dir))) { while (!ret && (ent = readdir(dir))) {
#define MAX_NAME 100 #define MAX_NAME 100
struct test__event_st e; struct evlist_test e;
char name[MAX_NAME]; char name[MAX_NAME];
if (!strcmp(ent->d_name, ".") || if (!strcmp(ent->d_name, ".") ||

4
tools/perf/util/parse-events.c
View File

@ -856,7 +856,7 @@ static int parse_events__scanner(const char *str, void *data, int start_token)
*/ */
int parse_events_terms(struct list_head *terms, const char *str) int parse_events_terms(struct list_head *terms, const char *str)
{ {
struct parse_events_data__terms data = { struct parse_events_terms data = {
.terms = NULL, .terms = NULL,
}; };
int ret; int ret;
@ -874,7 +874,7 @@ int parse_events_terms(struct list_head *terms, const char *str)
int parse_events(struct perf_evlist *evlist, const char *str) int parse_events(struct perf_evlist *evlist, const char *str)
{ {
struct parse_events_data__events data = { struct parse_events_evlist data = {
.list = LIST_HEAD_INIT(data.list), .list = LIST_HEAD_INIT(data.list),
.idx = evlist->nr_entries, .idx = evlist->nr_entries,
}; };

4
tools/perf/util/parse-events.h
View File

@ -61,12 +61,12 @@ struct parse_events_term {
struct list_head list; struct list_head list;
}; };
struct parse_events_data__events { struct parse_events_evlist {
struct list_head list; struct list_head list;
int idx; int idx;
}; };
struct parse_events_data__terms { struct parse_events_terms {
struct list_head *terms; struct list_head *terms;
}; };

26
tools/perf/util/parse-events.y
View File

@ -79,7 +79,7 @@ PE_START_TERMS start_terms
start_events: groups start_events: groups
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
parse_events_update_lists($1, &data->list); parse_events_update_lists($1, &data->list);
} }
@ -186,7 +186,7 @@ event_def: event_pmu |
event_pmu: event_pmu:
PE_NAME '/' event_config '/' PE_NAME '/' event_config '/'
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
ABORT_ON(parse_events_add_pmu(&list, &data->idx, $1, $3)); ABORT_ON(parse_events_add_pmu(&list, &data->idx, $1, $3));
@ -202,7 +202,7 @@ PE_VALUE_SYM_SW
event_legacy_symbol: event_legacy_symbol:
value_sym '/' event_config '/' value_sym '/' event_config '/'
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
int type = $1 >> 16; int type = $1 >> 16;
int config = $1 & 255; int config = $1 & 255;
@ -215,7 +215,7 @@ value_sym '/' event_config '/'
| |
value_sym sep_slash_dc value_sym sep_slash_dc
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
int type = $1 >> 16; int type = $1 >> 16;
int config = $1 & 255; int config = $1 & 255;
@ -228,7 +228,7 @@ value_sym sep_slash_dc
event_legacy_cache: event_legacy_cache:
PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, $5)); ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, $5));
@ -237,7 +237,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT
| |
PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, NULL)); ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, NULL));
@ -246,7 +246,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT
| |
PE_NAME_CACHE_TYPE PE_NAME_CACHE_TYPE
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, NULL, NULL)); ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, NULL, NULL));
@ -256,7 +256,7 @@ PE_NAME_CACHE_TYPE
event_legacy_mem: event_legacy_mem:
PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
ABORT_ON(parse_events_add_breakpoint(&list, &data->idx, ABORT_ON(parse_events_add_breakpoint(&list, &data->idx,
@ -266,7 +266,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc
| |
PE_PREFIX_MEM PE_VALUE sep_dc PE_PREFIX_MEM PE_VALUE sep_dc
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
ABORT_ON(parse_events_add_breakpoint(&list, &data->idx, ABORT_ON(parse_events_add_breakpoint(&list, &data->idx,
@ -277,7 +277,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc
event_legacy_tracepoint: event_legacy_tracepoint:
PE_NAME ':' PE_NAME PE_NAME ':' PE_NAME
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
ABORT_ON(parse_events_add_tracepoint(&list, &data->idx, $1, $3)); ABORT_ON(parse_events_add_tracepoint(&list, &data->idx, $1, $3));
@ -287,7 +287,7 @@ PE_NAME ':' PE_NAME
event_legacy_numeric: event_legacy_numeric:
PE_VALUE ':' PE_VALUE PE_VALUE ':' PE_VALUE
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
ABORT_ON(parse_events_add_numeric(&list, &data->idx, (u32)$1, $3, NULL)); ABORT_ON(parse_events_add_numeric(&list, &data->idx, (u32)$1, $3, NULL));
@ -297,7 +297,7 @@ PE_VALUE ':' PE_VALUE
event_legacy_raw: event_legacy_raw:
PE_RAW PE_RAW
{ {
struct parse_events_data__events *data = _data; struct parse_events_evlist *data = _data;
struct list_head *list = NULL; struct list_head *list = NULL;
ABORT_ON(parse_events_add_numeric(&list, &data->idx, ABORT_ON(parse_events_add_numeric(&list, &data->idx,
@ -307,7 +307,7 @@ PE_RAW
start_terms: event_config start_terms: event_config
{ {
struct parse_events_data__terms *data = _data; struct parse_events_terms *data = _data;
data->terms = $1; data->terms = $1;
} }