Adding cpu_map event to pass/store cpu maps.
Link: http://lkml.kernel.org/n/tip-tomgwwohnuxvvalwu4zna...@git.kernel.org
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
tools/perf/util/event.c | 1 +
tools/perf/util/event.h | 8 ++++++++
tools/perf/util/session.c | 25 +++++++++++++++++++++++++
tools/perf/util/tool.h | 3 ++-
4 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 15fb35c6baed..9f8ffbfc5cd4 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -36,6 +36,7 @@ static const char *perf_event__names[] = {
[PERF_RECORD_AUXTRACE] = "AUXTRACE",
[PERF_RECORD_AUXTRACE_ERROR] = "AUXTRACE_ERROR",
[PERF_RECORD_THREAD_MAP] = "THREAD_MAP",
+ [PERF_RECORD_CPU_MAP] = "CPU_MAP",
};
const char *perf_event__name(unsigned int id)
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index c204dbf7e386..f05c4d868162 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -226,6 +226,7 @@ enum perf_user_event_type { /* above any possible kernel
type */
PERF_RECORD_AUXTRACE = 71,
PERF_RECORD_AUXTRACE_ERROR = 72,
PERF_RECORD_THREAD_MAP = 73,
+ PERF_RECORD_CPU_MAP = 74,
PERF_RECORD_HEADER_MAX
};
@@ -360,6 +361,12 @@ struct thread_map_event {
struct thread_map_data_event data[];
};
+struct cpu_map_event {
+ struct perf_event_header header;
+ u64 nr;
+ u64 cpu[];
+};
+
union perf_event {
struct perf_event_header header;
struct mmap_event mmap;
@@ -382,6 +389,7 @@ union perf_event {
struct aux_event aux;
struct itrace_start_event itrace_start;
struct thread_map_event thread_map;
+ struct cpu_map_event cpu_map;
};
void perf_event__print_totals(void);
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index e20cd50a9a8f..9db7cb19e4b4 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -321,6 +321,15 @@ int process_event_thread_map_stub(struct perf_tool *tool
__maybe_unused,
return 0;
}
+static
+int process_event_cpu_map_stub(struct perf_tool *tool __maybe_unused,
+ union perf_event *event __maybe_unused,
+ struct perf_session *session __maybe_unused)
+{
+ dump_printf(": unhandled!\n");
+ return 0;
+}
+
void perf_tool__fill_defaults(struct perf_tool *tool)
{
if (tool->sample == NULL)
@@ -371,6 +380,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
tool->auxtrace_error = process_event_auxtrace_error_stub;
if (tool->thread_map == NULL)
tool->thread_map = process_event_thread_map_stub;
+ if (tool->cpu_map == NULL)
+ tool->cpu_map = process_event_cpu_map_stub;
}
static void swap_sample_id_all(union perf_event *event, void *data)
@@ -639,6 +650,17 @@ static void perf_event__thread_map_swap(union perf_event
*event,
event->thread_map.data[i].pid =
bswap_64(event->thread_map.data[i].pid);
}
+static void perf_event__cpu_map_swap(union perf_event *event,
+ bool sample_id_all __maybe_unused)
+{
+ unsigned i;
+
+ event->cpu_map.nr = bswap_64(event->cpu_map.nr);
+
+ for (i = 0; i < event->cpu_map.nr; i++)
+ event->cpu_map.cpu[i] = bswap_64(event->cpu_map.cpu[i]);
+}
+
typedef void (*perf_event__swap_op)(union perf_event *event,
bool sample_id_all);
@@ -665,6 +687,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
[PERF_RECORD_AUXTRACE] = perf_event__auxtrace_swap,
[PERF_RECORD_AUXTRACE_ERROR] = perf_event__auxtrace_error_swap,
[PERF_RECORD_THREAD_MAP] = perf_event__thread_map_swap,
+ [PERF_RECORD_CPU_MAP] = perf_event__cpu_map_swap,
[PERF_RECORD_HEADER_MAX] = NULL,
};
@@ -1189,6 +1212,8 @@ static s64 perf_session__process_user_event(struct
perf_session *session,
return tool->auxtrace_error(tool, event, session);
case PERF_RECORD_THREAD_MAP:
return tool->thread_map(tool, event, session);
+ case PERF_RECORD_CPU_MAP:
+ return tool->cpu_map(tool, event, session);
default:
return -EINVAL;
}
diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h
index cbaffbeb5b18..ddb88a6e18ee 100644
--- a/tools/perf/util/tool.h
+++ b/tools/perf/util/tool.h
@@ -55,7 +55,8 @@ struct perf_tool {
id_index,
auxtrace_info,
auxtrace_error,
- thread_map;
+ thread_map,
+ cpu_map;
event_op3 auxtrace;
bool ordered_events;
bool ordering_requires_timestamps;
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
