Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perf tools: De-opt the parse_events function

Browse source 
Moving out the option parameter from parse_events function,
and adding new parse_events_option function instead.

The option parameter is used only to carry "struct perf_evlist"
pointer for chaining new events. Putting it away, enable us
to call parse_events from other places without using the
option parameter.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: acme@redhat.com
Cc: a.p.zijlstra@chello.nl
Cc: paulus@samba.org
Link: http://lkml.kernel.org/r/1310635534-4013-2-git-send-email-jolsa@redhat.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jiri Olsa 2011-07-14 11:25:32 +02:00 committed by Ingo Molnar
parent adc4bf9955
commit f120f9d51b
5 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/builtin-record.c
View file

@ -740,7 +740,7 @@ static bool force, append_file;
const struct option record_options[] = { const struct option record_options[] = {
OPT_CALLBACK('e', "event", &evsel_list, "event", OPT_CALLBACK('e', "event", &evsel_list, "event",
"event selector. use 'perf list' to list available events", "event selector. use 'perf list' to list available events",
parse_events), parse_events_option),
OPT_CALLBACK(0, "filter", &evsel_list, "filter", OPT_CALLBACK(0, "filter", &evsel_list, "filter",
"event filter", parse_filter), "event filter", parse_filter),
OPT_INTEGER('p', "pid", &target_pid, OPT_INTEGER('p', "pid", &target_pid,

2
tools/perf/builtin-stat.c
View file

@ -1032,7 +1032,7 @@ static int stat__set_big_num(const struct option *opt __used,
static const struct option options[] = { static const struct option options[] = {
OPT_CALLBACK('e', "event", &evsel_list, "event", OPT_CALLBACK('e', "event", &evsel_list, "event",
"event selector. use 'perf list' to list available events", "event selector. use 'perf list' to list available events",
parse_events), parse_events_option),
OPT_CALLBACK(0, "filter", &evsel_list, "filter", OPT_CALLBACK(0, "filter", &evsel_list, "filter",
"event filter", parse_filter), "event filter", parse_filter),
OPT_BOOLEAN('i', "no-inherit", &no_inherit, OPT_BOOLEAN('i', "no-inherit", &no_inherit,

2
tools/perf/builtin-top.c
View file

@ -990,7 +990,7 @@ static const char * const top_usage[] = {
static const struct option options[] = { static const struct option options[] = {
OPT_CALLBACK('e', "event", &top.evlist, "event", OPT_CALLBACK('e', "event", &top.evlist, "event",
"event selector. use 'perf list' to list available events", "event selector. use 'perf list' to list available events",
parse_events), parse_events_option),
OPT_INTEGER('c', "count", &default_interval, OPT_INTEGER('c', "count", &default_interval,
"event period to sample"), "event period to sample"),
OPT_INTEGER('p', "pid", &top.target_pid, OPT_INTEGER('p', "pid", &top.target_pid,

26
tools/perf/util/parse-events.c
View file

@ -478,7 +478,7 @@ parse_single_tracepoint_event(char *sys_name,
/* sys + ':' + event + ':' + flags*/ /* sys + ':' + event + ':' + flags*/
#define MAX_EVOPT_LEN (MAX_EVENT_LENGTH * 2 + 2 + 128) #define MAX_EVOPT_LEN (MAX_EVENT_LENGTH * 2 + 2 + 128)
static enum event_result static enum event_result
parse_multiple_tracepoint_event(const struct option *opt, char *sys_name, parse_multiple_tracepoint_event(struct perf_evlist *evlist, char *sys_name,
const char *evt_exp, char *flags) const char *evt_exp, char *flags)
{ {
char evt_path[MAXPATHLEN]; char evt_path[MAXPATHLEN];
@ -512,7 +512,7 @@ parse_multiple_tracepoint_event(const struct option *opt, char *sys_name,
if (len < 0) if (len < 0)
return EVT_FAILED; return EVT_FAILED;
if (parse_events(opt, event_opt, 0)) if (parse_events(evlist, event_opt, 0))
return EVT_FAILED; return EVT_FAILED;
} }
@ -520,7 +520,7 @@ parse_multiple_tracepoint_event(const struct option *opt, char *sys_name,
} }
static enum event_result static enum event_result
parse_tracepoint_event(const struct option *opt, const char **strp, parse_tracepoint_event(struct perf_evlist *evlist, const char **strp,
struct perf_event_attr *attr) struct perf_event_attr *attr)
{ {
const char *evt_name; const char *evt_name;
@ -560,8 +560,8 @@ parse_tracepoint_event(const struct option *opt, const char **strp,
return EVT_FAILED; return EVT_FAILED;
if (strpbrk(evt_name, "*?")) { if (strpbrk(evt_name, "*?")) {
*strp += strlen(sys_name) + evt_length + 1; /* 1 == the ':' */ *strp += strlen(sys_name) + evt_length + 1; /* 1 == the ':' */
return parse_multiple_tracepoint_event(opt, sys_name, evt_name, return parse_multiple_tracepoint_event(evlist, sys_name,
flags); evt_name, flags);
} else { } else {
return parse_single_tracepoint_event(sys_name, evt_name, return parse_single_tracepoint_event(sys_name, evt_name,
evt_length, attr, strp); evt_length, attr, strp);
@ -781,12 +781,12 @@ parse_event_modifier(const char **strp, struct perf_event_attr *attr)
* Symbolic names are (almost) exactly matched. * Symbolic names are (almost) exactly matched.
*/ */
static enum event_result static enum event_result
parse_event_symbols(const struct option *opt, const char **str, parse_event_symbols(struct perf_evlist *evlist, const char **str,
struct perf_event_attr *attr) struct perf_event_attr *attr)
{ {
enum event_result ret; enum event_result ret;
ret = parse_tracepoint_event(opt, str, attr); ret = parse_tracepoint_event(evlist, str, attr);
if (ret != EVT_FAILED) if (ret != EVT_FAILED)
goto modifier; goto modifier;
@ -825,9 +825,8 @@ parse_event_symbols(const struct option *opt, const char **str,
return ret; return ret;
} }
int parse_events(const struct option *opt, const char *str, int unset __used) int parse_events(struct perf_evlist *evlist , const char *str, int unset __used)
{ {
struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
struct perf_event_attr attr; struct perf_event_attr attr;
enum event_result ret; enum event_result ret;
const char *ostr; const char *ostr;
@ -835,7 +834,7 @@ int parse_events(const struct option *opt, const char *str, int unset __used)
for (;;) { for (;;) {
ostr = str; ostr = str;
memset(&attr, 0, sizeof(attr)); memset(&attr, 0, sizeof(attr));
ret = parse_event_symbols(opt, &str, &attr); ret = parse_event_symbols(evlist, &str, &attr);
if (ret == EVT_FAILED) if (ret == EVT_FAILED)
return -1; return -1;
@ -866,6 +865,13 @@ int parse_events(const struct option *opt, const char *str, int unset __used)
return 0; return 0;
} }
int parse_events_option(const struct option *opt, const char *str,
int unset __used)
{
struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
return parse_events(evlist, str, unset);
}
int parse_filter(const struct option *opt, const char *str, int parse_filter(const struct option *opt, const char *str,
int unset __used) int unset __used)
{ {

6
tools/perf/util/parse-events.h
View file

@ -8,6 +8,7 @@
struct list_head; struct list_head;
struct perf_evsel; struct perf_evsel;
struct perf_evlist;
struct option; struct option;
@ -24,7 +25,10 @@ const char *event_type(int type);
const char *event_name(struct perf_evsel *event); const char *event_name(struct perf_evsel *event);
extern const char *__event_name(int type, u64 config); 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_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); extern int parse_filter(const struct option *opt, const char *str, int unset);
#define EVENTS_HELP_MAX (128*1024) #define EVENTS_HELP_MAX (128*1024)