5d7be90ed5
The event modifier needs to be applied only on the event definition it is attached to. The current state is that in case of multiple events definition (in single '-e' option, separated by ',') all will get modifier of the last one. Fixing this by adding separated list for each event definition, so the modifier is applied only to proper event(s). Added automated test to catch this, plus some other modifier tests. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1332267341-26338-3-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
93 lines
2.9 KiB
C
93 lines
2.9 KiB
C
#ifndef __PERF_PARSE_EVENTS_H
|
|
#define __PERF_PARSE_EVENTS_H
|
|
/*
|
|
* Parse symbolic events/counts passed in as options:
|
|
*/
|
|
|
|
#include "../../../include/linux/perf_event.h"
|
|
|
|
struct list_head;
|
|
struct perf_evsel;
|
|
struct perf_evlist;
|
|
|
|
struct option;
|
|
|
|
struct tracepoint_path {
|
|
char *system;
|
|
char *name;
|
|
struct tracepoint_path *next;
|
|
};
|
|
|
|
extern struct tracepoint_path *tracepoint_id_to_path(u64 config);
|
|
extern bool have_tracepoints(struct list_head *evlist);
|
|
|
|
const char *event_type(int type);
|
|
const char *event_name(struct perf_evsel *event);
|
|
extern const char *__event_name(int type, u64 config);
|
|
|
|
extern int parse_events_option(const struct option *opt, const char *str,
|
|
int unset);
|
|
extern int parse_events(struct perf_evlist *evlist, const char *str,
|
|
int unset);
|
|
extern int parse_filter(const struct option *opt, const char *str, int unset);
|
|
|
|
#define EVENTS_HELP_MAX (128*1024)
|
|
|
|
enum {
|
|
PARSE_EVENTS__TERM_TYPE_CONFIG,
|
|
PARSE_EVENTS__TERM_TYPE_CONFIG1,
|
|
PARSE_EVENTS__TERM_TYPE_CONFIG2,
|
|
PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD,
|
|
PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE,
|
|
PARSE_EVENTS__TERM_TYPE_NUM,
|
|
PARSE_EVENTS__TERM_TYPE_STR,
|
|
|
|
PARSE_EVENTS__TERM_TYPE_HARDCODED_MAX =
|
|
PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE,
|
|
};
|
|
|
|
struct parse_events__term {
|
|
char *config;
|
|
union {
|
|
char *str;
|
|
long num;
|
|
} val;
|
|
int type;
|
|
|
|
struct list_head list;
|
|
};
|
|
|
|
int parse_events__is_hardcoded_term(struct parse_events__term *term);
|
|
int parse_events__new_term(struct parse_events__term **term, int type,
|
|
char *config, char *str, long num);
|
|
void parse_events__free_terms(struct list_head *terms);
|
|
int parse_events_modifier(struct list_head *list __used, char *str __used);
|
|
int parse_events_add_tracepoint(struct list_head *list, int *idx,
|
|
char *sys, char *event);
|
|
int parse_events_add_raw(struct perf_evlist *evlist, unsigned long config,
|
|
unsigned long config1, unsigned long config2,
|
|
char *mod);
|
|
int parse_events_add_numeric(struct list_head *list, int *idx,
|
|
unsigned long type, unsigned long config,
|
|
struct list_head *head_config);
|
|
int parse_events_add_cache(struct list_head *list, int *idx,
|
|
char *type, char *op_result1, char *op_result2);
|
|
int parse_events_add_breakpoint(struct list_head *list, int *idx,
|
|
void *ptr, char *type);
|
|
int parse_events_add_pmu(struct list_head *list, int *idx,
|
|
char *pmu , struct list_head *head_config);
|
|
void parse_events_update_lists(struct list_head *list_event,
|
|
struct list_head *list_all);
|
|
void parse_events_error(struct list_head *list_all,
|
|
struct list_head *list_event,
|
|
int *idx, char const *msg);
|
|
|
|
void print_events(const char *event_glob);
|
|
void print_events_type(u8 type);
|
|
void print_tracepoint_events(const char *subsys_glob, const char *event_glob);
|
|
int print_hwcache_events(const char *event_glob);
|
|
extern int is_valid_tracepoint(const char *event_string);
|
|
|
|
extern int valid_debugfs_mount(const char *debugfs);
|
|
|
|
#endif /* __PERF_PARSE_EVENTS_H */
|