diff options
author | Jiri Olsa <jolsa@kernel.org> | 2019-07-27 14:30:53 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-09-25 08:51:44 -0400 |
commit | a583053299c1e66e6202b494cbc3acd93cedc4cc (patch) | |
tree | 92f2e5753b29e1913df93abf1b57f18510a01070 /tools/perf/util/python.c | |
parent | 058bd857845a9675cfaf4bc2ca831ec7953b58f1 (diff) |
perf tools: Rename 'struct perf_mmap' to 'struct mmap'
Rename 'struct perf_evlist' to 'struct evlist', so we don't have a name
clash when we add 'struct perf_mmap' to libperf.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-4-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/python.c')
-rw-r--r-- | tools/perf/util/python.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 0ba19dd75510..1e1247cffea8 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c | |||
@@ -984,12 +984,12 @@ static PyObject *pyrf_evlist__add(struct pyrf_evlist *pevlist, | |||
984 | return Py_BuildValue("i", evlist->core.nr_entries); | 984 | return Py_BuildValue("i", evlist->core.nr_entries); |
985 | } | 985 | } |
986 | 986 | ||
987 | static struct perf_mmap *get_md(struct evlist *evlist, int cpu) | 987 | static struct mmap *get_md(struct evlist *evlist, int cpu) |
988 | { | 988 | { |
989 | int i; | 989 | int i; |
990 | 990 | ||
991 | for (i = 0; i < evlist->nr_mmaps; i++) { | 991 | for (i = 0; i < evlist->nr_mmaps; i++) { |
992 | struct perf_mmap *md = &evlist->mmap[i]; | 992 | struct mmap *md = &evlist->mmap[i]; |
993 | 993 | ||
994 | if (md->cpu == cpu) | 994 | if (md->cpu == cpu) |
995 | return md; | 995 | return md; |
@@ -1005,7 +1005,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, | |||
1005 | union perf_event *event; | 1005 | union perf_event *event; |
1006 | int sample_id_all = 1, cpu; | 1006 | int sample_id_all = 1, cpu; |
1007 | static char *kwlist[] = { "cpu", "sample_id_all", NULL }; | 1007 | static char *kwlist[] = { "cpu", "sample_id_all", NULL }; |
1008 | struct perf_mmap *md; | 1008 | struct mmap *md; |
1009 | int err; | 1009 | int err; |
1010 | 1010 | ||
1011 | if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, | 1011 | if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, |