perf auxtrace: Make auxtrace_queues__add_buffer() do CPU filtering

In preparation for supporting AUX area sampling buffers,
auxtrace_queues__add_buffer() needs to be more generic. To that end, move
CPU filtering into it.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1520327598-1317-8-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index e1aff91c54a887bf7f97ff986c609945d9a85092..857de69a53610ebfeea697fc61df170986ef53ff 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -302,6 +302,13 @@ static int auxtrace_queues__split_buffer(struct auxtrace_queues *queues,
        return 0;
 }
 
+static bool filter_cpu(struct perf_session *session, int cpu)
+{
+       unsigned long *cpu_bitmap = session->itrace_synth_opts->cpu_bitmap;
+
+       return cpu_bitmap && cpu != -1 && !test_bit(cpu, cpu_bitmap);
+}
+
 static int auxtrace_queues__add_buffer(struct auxtrace_queues *queues,
                                       struct perf_session *session,
                                       unsigned int idx,
@@ -310,6 +317,9 @@ static int auxtrace_queues__add_buffer(struct auxtrace_queues *queues,
 {
        int err = -ENOMEM;
 
+       if (filter_cpu(session, buffer->cpu))
+               return 0;
+
        buffer = memdup(buffer, sizeof(*buffer));
        if (!buffer)
                return -ENOMEM;
@@ -344,13 +354,6 @@ out_free:
        return err;
 }
 
-static bool filter_cpu(struct perf_session *session, int cpu)
-{
-       unsigned long *cpu_bitmap = session->itrace_synth_opts->cpu_bitmap;
-
-       return cpu_bitmap && cpu != -1 && !test_bit(cpu, cpu_bitmap);
-}
-
 int auxtrace_queues__add_event(struct auxtrace_queues *queues,
                               struct perf_session *session,
                               union perf_event *event, off_t data_offset,
@@ -367,9 +370,6 @@ int auxtrace_queues__add_event(struct auxtrace_queues *queues,
        };
        unsigned int idx = event->auxtrace.idx;
 
-       if (filter_cpu(session, event->auxtrace.cpu))
-               return 0;
-
        return auxtrace_queues__add_buffer(queues, session, idx, &buffer,
                                           buffer_ptr);
 }