UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf evsel: Rename perf_evsel__init() to evsel__init() 

Rename perf_evsel__init() to evsel__init(), so we don't have a name
clash when we add perf_evsel__init() in libperf.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-7-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2019-07-21 13:23:53 +02:00 committed by Arnaldo Carvalho de Melo
parent 63503dba87
commit b4b62ee688
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/perf/util/evsel.c
View File

@ -223,8 +223,8 @@ bool perf_evsel__is_function_event(struct evsel *evsel)
#undef FUNCTION_EVENT #undef FUNCTION_EVENT
} }
void perf_evsel__init(struct evsel *evsel, void evsel__init(struct evsel *evsel,
struct perf_event_attr *attr, int idx) struct perf_event_attr *attr, int idx)
{ {
evsel->idx = idx; evsel->idx = idx;
evsel->tracking = !idx; evsel->tracking = !idx;
@ -255,7 +255,7 @@ struct evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx)
if (!evsel) if (!evsel)
return NULL; return NULL;
perf_evsel__init(evsel, attr, idx); evsel__init(evsel, attr, idx);
if (perf_evsel__is_bpf_output(evsel)) { if (perf_evsel__is_bpf_output(evsel)) {
evsel->attr.sample_type |= (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | evsel->attr.sample_type |= (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME |
@ -350,7 +350,7 @@ struct evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx)
event_attr_init(&attr); event_attr_init(&attr);
attr.config = evsel->tp_format->id; attr.config = evsel->tp_format->id;
attr.sample_period = 1; attr.sample_period = 1;
perf_evsel__init(evsel, &attr, idx); evsel__init(evsel, &attr, idx);
} }
return evsel; return evsel;

3
tools/perf/util/evsel.h
View File

@ -238,8 +238,7 @@ struct evsel *perf_evsel__new_cycles(bool precise);
struct tep_event *event_format__new(const char *sys, const char *name); struct tep_event *event_format__new(const char *sys, const char *name);
void perf_evsel__init(struct evsel *evsel, void evsel__init(struct evsel *evsel, struct perf_event_attr *attr, int idx);
struct perf_event_attr *attr, int idx);
void perf_evsel__exit(struct evsel *evsel); void perf_evsel__exit(struct evsel *evsel);
void perf_evsel__delete(struct evsel *evsel); void perf_evsel__delete(struct evsel *evsel);

2
tools/perf/util/python.c
View File

@ -782,7 +782,7 @@ static int pyrf_evsel__init(struct pyrf_evsel *pevsel,
attr.sample_id_all = sample_id_all; attr.sample_id_all = sample_id_all;
attr.size = sizeof(attr); attr.size = sizeof(attr);
perf_evsel__init(&pevsel->evsel, &attr, idx); evsel__init(&pevsel->evsel, &attr, idx);
return 0; return 0;
} }