perf evlist: Rename struct perf_evlist to struct evlist
Rename struct perf_evlist to struct evlist, so we don't have a name clash when we add struct perf_evlist in libperf. Committer notes: Added fixes to build on arm64, from Jiri and from me (tools/perf/util/cs-etm.c) 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-6-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
32dcd021d0
commit
63503dba87
@@ -858,7 +858,7 @@ static int pyrf_evsel__setup_types(void)
|
||||
struct pyrf_evlist {
|
||||
PyObject_HEAD
|
||||
|
||||
struct perf_evlist evlist;
|
||||
struct evlist evlist;
|
||||
};
|
||||
|
||||
static int pyrf_evlist__init(struct pyrf_evlist *pevlist,
|
||||
@@ -886,7 +886,7 @@ static void pyrf_evlist__delete(struct pyrf_evlist *pevlist)
|
||||
static PyObject *pyrf_evlist__mmap(struct pyrf_evlist *pevlist,
|
||||
PyObject *args, PyObject *kwargs)
|
||||
{
|
||||
struct perf_evlist *evlist = &pevlist->evlist;
|
||||
struct evlist *evlist = &pevlist->evlist;
|
||||
static char *kwlist[] = { "pages", "overwrite", NULL };
|
||||
int pages = 128, overwrite = false;
|
||||
|
||||
@@ -906,7 +906,7 @@ static PyObject *pyrf_evlist__mmap(struct pyrf_evlist *pevlist,
|
||||
static PyObject *pyrf_evlist__poll(struct pyrf_evlist *pevlist,
|
||||
PyObject *args, PyObject *kwargs)
|
||||
{
|
||||
struct perf_evlist *evlist = &pevlist->evlist;
|
||||
struct evlist *evlist = &pevlist->evlist;
|
||||
static char *kwlist[] = { "timeout", NULL };
|
||||
int timeout = -1, n;
|
||||
|
||||
@@ -926,7 +926,7 @@ static PyObject *pyrf_evlist__get_pollfd(struct pyrf_evlist *pevlist,
|
||||
PyObject *args __maybe_unused,
|
||||
PyObject *kwargs __maybe_unused)
|
||||
{
|
||||
struct perf_evlist *evlist = &pevlist->evlist;
|
||||
struct evlist *evlist = &pevlist->evlist;
|
||||
PyObject *list = PyList_New(0);
|
||||
int i;
|
||||
|
||||
@@ -964,7 +964,7 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlist *pevlist,
|
||||
PyObject *args,
|
||||
PyObject *kwargs __maybe_unused)
|
||||
{
|
||||
struct perf_evlist *evlist = &pevlist->evlist;
|
||||
struct evlist *evlist = &pevlist->evlist;
|
||||
PyObject *pevsel;
|
||||
struct evsel *evsel;
|
||||
|
||||
@@ -979,7 +979,7 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlist *pevlist,
|
||||
return Py_BuildValue("i", evlist->nr_entries);
|
||||
}
|
||||
|
||||
static struct perf_mmap *get_md(struct perf_evlist *evlist, int cpu)
|
||||
static struct perf_mmap *get_md(struct evlist *evlist, int cpu)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -996,7 +996,7 @@ static struct perf_mmap *get_md(struct perf_evlist *evlist, int cpu)
|
||||
static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
|
||||
PyObject *args, PyObject *kwargs)
|
||||
{
|
||||
struct perf_evlist *evlist = &pevlist->evlist;
|
||||
struct evlist *evlist = &pevlist->evlist;
|
||||
union perf_event *event;
|
||||
int sample_id_all = 1, cpu;
|
||||
static char *kwlist[] = { "cpu", "sample_id_all", NULL };
|
||||
@@ -1049,7 +1049,7 @@ end:
|
||||
static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist,
|
||||
PyObject *args, PyObject *kwargs)
|
||||
{
|
||||
struct perf_evlist *evlist = &pevlist->evlist;
|
||||
struct evlist *evlist = &pevlist->evlist;
|
||||
int group = 0;
|
||||
static char *kwlist[] = { "group", NULL };
|
||||
|
||||
|
Reference in New Issue
Block a user