perf trace: Add filter Suppport
Add a new option "--filter <filter_str>" to perf record, and it should be right after "-e trace_point": #./perf record -R -f -e irq:irq_handler_entry --filter irq==18 ^C # ./perf trace perf-4303 ... irq_handler_entry: irq=18 handler=eth0 init-0 ... irq_handler_entry: irq=18 handler=eth0 init-0 ... irq_handler_entry: irq=18 handler=eth0 init-0 ... irq_handler_entry: irq=18 handler=eth0 init-0 ... irq_handler_entry: irq=18 handler=eth0 See Documentation/trace/events.txt for the syntax of filter expressions. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <4AD6955F.90602@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
6fb2915df7
commit
c171b552a7
|
@ -374,9 +374,11 @@ static struct perf_header_attr *get_header_attr(struct perf_event_attr *a, int n
|
|||
|
||||
static void create_counter(int counter, int cpu, pid_t pid)
|
||||
{
|
||||
char *filter = filters[counter];
|
||||
struct perf_event_attr *attr = attrs + counter;
|
||||
struct perf_header_attr *h_attr;
|
||||
int track = !counter; /* only the first counter needs these */
|
||||
int ret;
|
||||
struct {
|
||||
u64 count;
|
||||
u64 time_enabled;
|
||||
|
@ -479,7 +481,6 @@ try_again:
|
|||
multiplex_fd = fd[nr_cpu][counter];
|
||||
|
||||
if (multiplex && fd[nr_cpu][counter] != multiplex_fd) {
|
||||
int ret;
|
||||
|
||||
ret = ioctl(fd[nr_cpu][counter], PERF_EVENT_IOC_SET_OUTPUT, multiplex_fd);
|
||||
assert(ret != -1);
|
||||
|
@ -499,6 +500,16 @@ try_again:
|
|||
}
|
||||
}
|
||||
|
||||
if (filter != NULL) {
|
||||
ret = ioctl(fd[nr_cpu][counter],
|
||||
PERF_EVENT_IOC_SET_FILTER, filter);
|
||||
if (ret) {
|
||||
error("failed to set filter with %d (%s)\n", errno,
|
||||
strerror(errno));
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
ioctl(fd[nr_cpu][counter], PERF_EVENT_IOC_ENABLE);
|
||||
}
|
||||
|
||||
|
@ -676,6 +687,8 @@ static const struct option options[] = {
|
|||
OPT_CALLBACK('e', "event", NULL, "event",
|
||||
"event selector. use 'perf list' to list available events",
|
||||
parse_events),
|
||||
OPT_CALLBACK(0, "filter", NULL, "filter",
|
||||
"event filter", parse_filter),
|
||||
OPT_INTEGER('p', "pid", &target_pid,
|
||||
"record events on existing pid"),
|
||||
OPT_INTEGER('r', "realtime", &realtime_prio,
|
||||
|
|
|
@ -8,9 +8,10 @@
|
|||
#include "cache.h"
|
||||
#include "header.h"
|
||||
|
||||
int nr_counters;
|
||||
int nr_counters;
|
||||
|
||||
struct perf_event_attr attrs[MAX_COUNTERS];
|
||||
char *filters[MAX_COUNTERS];
|
||||
|
||||
struct event_symbol {
|
||||
u8 type;
|
||||
|
@ -708,7 +709,6 @@ static void store_event_type(const char *orgname)
|
|||
perf_header__push_event(id, orgname);
|
||||
}
|
||||
|
||||
|
||||
int parse_events(const struct option *opt __used, const char *str, int unset __used)
|
||||
{
|
||||
struct perf_event_attr attr;
|
||||
|
@ -745,6 +745,28 @@ int parse_events(const struct option *opt __used, const char *str, int unset __u
|
|||
return 0;
|
||||
}
|
||||
|
||||
int parse_filter(const struct option *opt __used, const char *str,
|
||||
int unset __used)
|
||||
{
|
||||
int i = nr_counters - 1;
|
||||
int len = strlen(str);
|
||||
|
||||
if (i < 0 || attrs[i].type != PERF_TYPE_TRACEPOINT) {
|
||||
fprintf(stderr,
|
||||
"-F option should follow a -e tracepoint option\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
filters[i] = malloc(len + 1);
|
||||
if (!filters[i]) {
|
||||
fprintf(stderr, "not enough memory to hold filter string\n");
|
||||
return -1;
|
||||
}
|
||||
strcpy(filters[i], str);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char * const event_type_descriptors[] = {
|
||||
"",
|
||||
"Hardware event",
|
||||
|
|
|
@ -17,11 +17,13 @@ extern struct tracepoint_path *tracepoint_id_to_path(u64 config);
|
|||
extern int nr_counters;
|
||||
|
||||
extern struct perf_event_attr attrs[MAX_COUNTERS];
|
||||
extern char *filters[MAX_COUNTERS];
|
||||
|
||||
extern const char *event_name(int ctr);
|
||||
extern const char *__event_name(int type, u64 config);
|
||||
|
||||
extern int parse_events(const struct option *opt, const char *str, int unset);
|
||||
extern int parse_filter(const struct option *opt, const char *str, int unset);
|
||||
|
||||
#define EVENTS_HELP_MAX (128*1024)
|
||||
|
||||
|
|
Loading…
Reference in New Issue