Commit d80518c9 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf tools: Add stat user level event

Adding a stat event to store a 'struct perf_counter_values' for a given
event/cpu/thread.
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarKan Liang <kan.liang@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1445784728-21732-15-git-send-email-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8e381596
...@@ -42,6 +42,7 @@ static const char *perf_event__names[] = { ...@@ -42,6 +42,7 @@ static const char *perf_event__names[] = {
[PERF_RECORD_THREAD_MAP] = "THREAD_MAP", [PERF_RECORD_THREAD_MAP] = "THREAD_MAP",
[PERF_RECORD_CPU_MAP] = "CPU_MAP", [PERF_RECORD_CPU_MAP] = "CPU_MAP",
[PERF_RECORD_STAT_CONFIG] = "STAT_CONFIG", [PERF_RECORD_STAT_CONFIG] = "STAT_CONFIG",
[PERF_RECORD_STAT] = "STAT",
}; };
const char *perf_event__name(unsigned int id) const char *perf_event__name(unsigned int id)
......
...@@ -229,6 +229,7 @@ enum perf_user_event_type { /* above any possible kernel type */ ...@@ -229,6 +229,7 @@ enum perf_user_event_type { /* above any possible kernel type */
PERF_RECORD_THREAD_MAP = 73, PERF_RECORD_THREAD_MAP = 73,
PERF_RECORD_CPU_MAP = 74, PERF_RECORD_CPU_MAP = 74,
PERF_RECORD_STAT_CONFIG = 75, PERF_RECORD_STAT_CONFIG = 75,
PERF_RECORD_STAT = 76,
PERF_RECORD_HEADER_MAX PERF_RECORD_HEADER_MAX
}; };
...@@ -414,6 +415,23 @@ struct stat_config_event { ...@@ -414,6 +415,23 @@ struct stat_config_event {
struct stat_config_event_entry data[]; struct stat_config_event_entry data[];
}; };
struct stat_event {
struct perf_event_header header;
u64 id;
u32 cpu;
u32 thread;
union {
struct {
u64 val;
u64 ena;
u64 run;
};
u64 values[3];
};
};
union perf_event { union perf_event {
struct perf_event_header header; struct perf_event_header header;
struct mmap_event mmap; struct mmap_event mmap;
...@@ -439,6 +457,7 @@ union perf_event { ...@@ -439,6 +457,7 @@ union perf_event {
struct thread_map_event thread_map; struct thread_map_event thread_map;
struct cpu_map_event cpu_map; struct cpu_map_event cpu_map;
struct stat_config_event stat_config; struct stat_config_event stat_config;
struct stat_event stat;
}; };
void perf_event__print_totals(void); void perf_event__print_totals(void);
......
...@@ -324,6 +324,15 @@ int process_event_stat_config_stub(struct perf_tool *tool __maybe_unused, ...@@ -324,6 +324,15 @@ int process_event_stat_config_stub(struct perf_tool *tool __maybe_unused,
return 0; return 0;
} }
static int process_stat_stub(struct perf_tool *tool __maybe_unused,
union perf_event *event __maybe_unused,
struct perf_session *perf_session
__maybe_unused)
{
dump_printf(": unhandled!\n");
return 0;
}
void perf_tool__fill_defaults(struct perf_tool *tool) void perf_tool__fill_defaults(struct perf_tool *tool)
{ {
if (tool->sample == NULL) if (tool->sample == NULL)
...@@ -380,6 +389,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) ...@@ -380,6 +389,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool)
tool->cpu_map = process_event_cpu_map_stub; tool->cpu_map = process_event_cpu_map_stub;
if (tool->stat_config == NULL) if (tool->stat_config == NULL)
tool->stat_config = process_event_stat_config_stub; tool->stat_config = process_event_stat_config_stub;
if (tool->stat == NULL)
tool->stat = process_stat_stub;
} }
static void swap_sample_id_all(union perf_event *event, void *data) static void swap_sample_id_all(union perf_event *event, void *data)
...@@ -707,6 +718,17 @@ static void perf_event__stat_config_swap(union perf_event *event, ...@@ -707,6 +718,17 @@ static void perf_event__stat_config_swap(union perf_event *event,
mem_bswap_64(&event->stat_config.nr, size); mem_bswap_64(&event->stat_config.nr, size);
} }
static void perf_event__stat_swap(union perf_event *event,
bool sample_id_all __maybe_unused)
{
event->stat.id = bswap_64(event->stat.id);
event->stat.thread = bswap_32(event->stat.thread);
event->stat.cpu = bswap_32(event->stat.cpu);
event->stat.val = bswap_64(event->stat.val);
event->stat.ena = bswap_64(event->stat.ena);
event->stat.run = bswap_64(event->stat.run);
}
typedef void (*perf_event__swap_op)(union perf_event *event, typedef void (*perf_event__swap_op)(union perf_event *event,
bool sample_id_all); bool sample_id_all);
...@@ -737,6 +759,7 @@ static perf_event__swap_op perf_event__swap_ops[] = { ...@@ -737,6 +759,7 @@ static perf_event__swap_op perf_event__swap_ops[] = {
[PERF_RECORD_THREAD_MAP] = perf_event__thread_map_swap, [PERF_RECORD_THREAD_MAP] = perf_event__thread_map_swap,
[PERF_RECORD_CPU_MAP] = perf_event__cpu_map_swap, [PERF_RECORD_CPU_MAP] = perf_event__cpu_map_swap,
[PERF_RECORD_STAT_CONFIG] = perf_event__stat_config_swap, [PERF_RECORD_STAT_CONFIG] = perf_event__stat_config_swap,
[PERF_RECORD_STAT] = perf_event__stat_swap,
[PERF_RECORD_HEADER_MAX] = NULL, [PERF_RECORD_HEADER_MAX] = NULL,
}; };
...@@ -1279,6 +1302,8 @@ static s64 perf_session__process_user_event(struct perf_session *session, ...@@ -1279,6 +1302,8 @@ static s64 perf_session__process_user_event(struct perf_session *session,
return tool->cpu_map(tool, event, session); return tool->cpu_map(tool, event, session);
case PERF_RECORD_STAT_CONFIG: case PERF_RECORD_STAT_CONFIG:
return tool->stat_config(tool, event, session); return tool->stat_config(tool, event, session);
case PERF_RECORD_STAT:
return tool->stat(tool, event, session);
default: default:
return -EINVAL; return -EINVAL;
} }
......
...@@ -58,7 +58,8 @@ struct perf_tool { ...@@ -58,7 +58,8 @@ struct perf_tool {
auxtrace_error, auxtrace_error,
thread_map, thread_map,
cpu_map, cpu_map,
stat_config; stat_config,
stat;
event_op3 auxtrace; event_op3 auxtrace;
bool ordered_events; bool ordered_events;
bool ordering_requires_timestamps; bool ordering_requires_timestamps;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment