Skip to content

Commit

Permalink
perf tools: Fix usage of __ in event parsing struct names
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Arnaldo Carvalho de Melo committed Jan 24, 2013
1 parent 7c3102b commit 23b6339
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
24 changes: 12 additions & 12 deletions tools/perf/tests/parse-events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -840,13 +840,13 @@ static int test__all_tracepoints(struct perf_evlist *evlist)
return test__checkevent_tracepoint_multi(evlist);
}

struct test__event_st {
struct evlist_test {
const char *name;
__u32 type;
int (*check)(struct perf_evlist *evlist);
};

static struct test__event_st test__events[] = {
static struct evlist_test test__events[] = {
[0] = {
.name = "syscalls:sys_enter_open",
.check = test__checkevent_tracepoint,
Expand Down Expand Up @@ -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] = {
.name = "cpu/config=10,config1,config2=3,period=1000/u",
.check = test__checkevent_pmu,
Expand All @@ -996,20 +996,20 @@ static struct test__event_st test__events_pmu[] = {
},
};

struct test__term {
struct terms_test {
const char *str;
__u32 type;
int (*check)(struct list_head *terms);
};

static struct test__term test__terms[] = {
static struct terms_test test__terms[] = {
[0] = {
.str = "config=10,config1,config2=3,umask=1",
.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;
int ret;
Expand All @@ -1031,13 +1031,13 @@ static int test_event(struct test__event_st *e)
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;
unsigned 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);
ret1 = test_event(e);
Expand All @@ -1048,7 +1048,7 @@ static int test_events(struct test__event_st *events, unsigned cnt)
return ret2;
}

static int test_term(struct test__term *t)
static int test_term(struct terms_test *t)
{
struct list_head *terms;
int ret;
Expand All @@ -1072,13 +1072,13 @@ static int test_term(struct test__term *t)
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;
unsigned 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);
ret = test_term(t);
Expand Down Expand Up @@ -1129,7 +1129,7 @@ static int test_pmu_events(void)

while (!ret && (ent = readdir(dir))) {
#define MAX_NAME 100
struct test__event_st e;
struct evlist_test e;
char name[MAX_NAME];

if (!strcmp(ent->d_name, ".") ||
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/parse-events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct parse_events_data__terms data = {
struct parse_events_terms data = {
.terms = NULL,
};
int ret;
Expand All @@ -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)
{
struct parse_events_data__events data = {
struct parse_events_evlist data = {
.list = LIST_HEAD_INIT(data.list),
.idx = evlist->nr_entries,
};
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/parse-events.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ struct parse_events_term {
struct list_head list;
};

struct parse_events_data__events {
struct parse_events_evlist {
struct list_head list;
int idx;
};

struct parse_events_data__terms {
struct parse_events_terms {
struct list_head *terms;
};

Expand Down
26 changes: 13 additions & 13 deletions tools/perf/util/parse-events.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ PE_START_TERMS start_terms

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

parse_events_update_lists($1, &data->list);
}
Expand Down Expand Up @@ -186,7 +186,7 @@ event_def: event_pmu |
event_pmu:
PE_NAME '/' event_config '/'
{
struct parse_events_data__events *data = _data;
struct parse_events_evlist *data = _data;
struct list_head *list = NULL;

ABORT_ON(parse_events_add_pmu(&list, &data->idx, $1, $3));
Expand All @@ -202,7 +202,7 @@ PE_VALUE_SYM_SW
event_legacy_symbol:
value_sym '/' event_config '/'
{
struct parse_events_data__events *data = _data;
struct parse_events_evlist *data = _data;
struct list_head *list = NULL;
int type = $1 >> 16;
int config = $1 & 255;
Expand All @@ -215,7 +215,7 @@ value_sym '/' event_config '/'
|
value_sym sep_slash_dc
{
struct parse_events_data__events *data = _data;
struct parse_events_evlist *data = _data;
struct list_head *list = NULL;
int type = $1 >> 16;
int config = $1 & 255;
Expand All @@ -228,7 +228,7 @@ value_sym sep_slash_dc
event_legacy_cache:
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;

ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, $5));
Expand All @@ -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
{
struct parse_events_data__events *data = _data;
struct parse_events_evlist *data = _data;
struct list_head *list = NULL;

ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, NULL));
Expand All @@ -246,7 +246,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT
|
PE_NAME_CACHE_TYPE
{
struct parse_events_data__events *data = _data;
struct parse_events_evlist *data = _data;
struct list_head *list = NULL;

ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, NULL, NULL));
Expand All @@ -256,7 +256,7 @@ PE_NAME_CACHE_TYPE
event_legacy_mem:
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;

ABORT_ON(parse_events_add_breakpoint(&list, &data->idx,
Expand All @@ -266,7 +266,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP 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;

ABORT_ON(parse_events_add_breakpoint(&list, &data->idx,
Expand All @@ -277,7 +277,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc
event_legacy_tracepoint:
PE_NAME ':' PE_NAME
{
struct parse_events_data__events *data = _data;
struct parse_events_evlist *data = _data;
struct list_head *list = NULL;

ABORT_ON(parse_events_add_tracepoint(&list, &data->idx, $1, $3));
Expand All @@ -287,7 +287,7 @@ PE_NAME ':' PE_NAME
event_legacy_numeric:
PE_VALUE ':' PE_VALUE
{
struct parse_events_data__events *data = _data;
struct parse_events_evlist *data = _data;
struct list_head *list = NULL;

ABORT_ON(parse_events_add_numeric(&list, &data->idx, (u32)$1, $3, NULL));
Expand All @@ -297,7 +297,7 @@ PE_VALUE ':' PE_VALUE
event_legacy_raw:
PE_RAW
{
struct parse_events_data__events *data = _data;
struct parse_events_evlist *data = _data;
struct list_head *list = NULL;

ABORT_ON(parse_events_add_numeric(&list, &data->idx,
Expand All @@ -307,7 +307,7 @@ PE_RAW

start_terms: event_config
{
struct parse_events_data__terms *data = _data;
struct parse_events_terms *data = _data;
data->terms = $1;
}

Expand Down

0 comments on commit 23b6339

Please sign in to comment.