Commit 17ea1b70 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Pass the struct opt to the wildcard parsing routine 



It is needed because it will call parse_event for each tracepoint
name that matches, and we pass the perf_evlist via opt->value.

Problem introduced in 4503fdd where my assumption about opt being
always non NULL made me not look at callers of parse_events outside
builtin-*.c.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d7065adb

tools/perf/util/parse-events.c

+11 −9
Original line number Original line Diff line number Diff line
@@ -446,8 +446,8 @@ 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(char *sys_name, const char *evt_exp,

parse_multiple_tracepoint_event(const struct option *opt, char *sys_name,

				char *flags)

				const char *evt_exp, char *flags)

{

{

	char evt_path[MAXPATHLEN];

	char evt_path[MAXPATHLEN];

	struct dirent *evt_ent;

	struct dirent *evt_ent;
@@ -480,14 +480,15 @@ parse_multiple_tracepoint_event(char *sys_name, const char *evt_exp, 
		if (len < 0)

		if (len < 0)

			return EVT_FAILED;

			return EVT_FAILED;





		if (parse_events(NULL, event_opt, 0))

		if (parse_events(opt, event_opt, 0))

			return EVT_FAILED;

			return EVT_FAILED;

	}

	}





	return EVT_HANDLED_ALL;

	return EVT_HANDLED_ALL;

}

}





static enum event_result parse_tracepoint_event(const char **strp,

static enum event_result

parse_tracepoint_event(const struct option *opt, const char **strp,

		       struct perf_event_attr *attr)

		       struct perf_event_attr *attr)

{

{

	const char *evt_name;

	const char *evt_name;
@@ -527,7 +528,7 @@ static enum event_result parse_tracepoint_event(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(sys_name, evt_name,

		return parse_multiple_tracepoint_event(opt, sys_name, evt_name,

						       flags);

						       flags);

	} else {

	} else {

		return parse_single_tracepoint_event(sys_name, evt_name,

		return parse_single_tracepoint_event(sys_name, evt_name,
@@ -737,11 +738,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 char **str, struct perf_event_attr *attr)

parse_event_symbols(const struct option *opt, const char **str,

		    struct perf_event_attr *attr)

{

{

	enum event_result ret;

	enum event_result ret;





	ret = parse_tracepoint_event(str, attr);

	ret = parse_tracepoint_event(opt, str, attr);

	if (ret != EVT_FAILED)

	if (ret != EVT_FAILED)

		goto modifier;

		goto modifier;
@@ -783,7 +785,7 @@ int parse_events(const struct option *opt, const char *str, int unset __used) 




	for (;;) {

	for (;;) {

		memset(&attr, 0, sizeof(attr));

		memset(&attr, 0, sizeof(attr));

		ret = parse_event_symbols(&str, &attr);

		ret = parse_event_symbols(opt, &str, &attr);

		if (ret == EVT_FAILED)

		if (ret == EVT_FAILED)

			return -1;

			return -1;