perf evlist: Store pointer to the cpu and thread maps

So that we don't have to pass it around to the several methods that
needs it, simplifying usage.

There is one case where we don't have the thread/cpu map in advance,
which is in the parsing routines used by top, stat, record, that we have
to wait till all options are parsed to know if a cpu or thread list was
passed to then create those maps.

For that case consolidate the cpu and thread map creation via
perf_evlist__create_maps() out of the code in top and record, while also
providing a perf_evlist__set_maps() for cases where multiple evlists
share maps or for when maps that represent CPU sockets, for instance,
get crafted out of topology information or subsets of threads in a
particular application are to be monitored, providing more granularity
in specifying which cpus and threads to monitor.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 14 insertions, 11 deletions

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 88d47895a79c..d2d52175362e 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -553,7 +553,16 @@ struct pyrf_evlist {
 static int pyrf_evlist__init(struct pyrf_evlist *pevlist,
                              PyObject *args, PyObject *kwargs)
 {
-        perf_evlist__init(&pevlist->evlist);
+        PyObject *pcpus = NULL, *pthreads = NULL;
+        struct cpu_map *cpus;
+        struct thread_map *threads;
+
+        if (!PyArg_ParseTuple(args, "OO", &pcpus, &pthreads))
+                return -1;
+
+        threads = ((struct pyrf_thread_map *)pthreads)->threads;
+        cpus = ((struct pyrf_cpu_map *)pcpus)->cpus;
+        perf_evlist__init(&pevlist->evlist, cpus, threads);
         return 0;
 }
 
@@ -567,21 +576,15 @@ static PyObject *pyrf_evlist__mmap(struct pyrf_evlist *pevlist,
                                    PyObject *args, PyObject *kwargs)
 {
         struct perf_evlist *evlist = &pevlist->evlist;
-        PyObject *pcpus = NULL, *pthreads = NULL;
-        struct cpu_map *cpus = NULL;
-        struct thread_map *threads = NULL;
-        static char *kwlist[] = {"cpus", "threads", "pages", "overwrite",
+        static char *kwlist[] = {"pages", "overwrite",
                                   NULL, NULL};
         int pages = 128, overwrite = false;
 
-        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|ii", kwlist,
-                                         &pcpus, &pthreads, &pages, &overwrite))
+        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ii", kwlist,
+                                         &pages, &overwrite))
                 return NULL;
 
-        threads = ((struct pyrf_thread_map *)pthreads)->threads;
-        cpus = ((struct pyrf_cpu_map *)pcpus)->cpus;
-
-        if (perf_evlist__mmap(evlist, cpus, threads, pages, overwrite) < 0) {
+        if (perf_evlist__mmap(evlist, pages, overwrite) < 0) {
                 PyErr_SetFromErrno(PyExc_OSError);
                 return NULL;
         }