summaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2018-03-06 11:13:18 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-04-06 09:40:41 -0300
commitb238db655796e74b59d9ece58b645ad0b494d615 (patch)
tree55c53c324887556ed81917e50a9a1a1df367272b /tools/perf
parent01f97511f13cbf2ba3d23b2bffa06258dc81e283 (diff)
downloadlinux-stable-b238db655796e74b59d9ece58b645ad0b494d615.tar.gz
linux-stable-b238db655796e74b59d9ece58b645ad0b494d615.tar.bz2
linux-stable-b238db655796e74b59d9ece58b645ad0b494d615.zip
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>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/auxtrace.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index e1aff91c54a8..857de69a5361 100644
--- 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);
}