Commit f35488f9 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add support for wildcard in tracepoint system name 



Adding support for wildcards '*?" in the tracepoint system part.

It's now possible to open all available tracepoints like:

  # perf stat -e '*:*' ls

You might need to increase limit for open files via ulimit.

If ftrace events tracepoints are configured in, the record command fails
on above event selection because of them.

The stat command disables counters that fails to open, the record
command fails completely. We probably want to be smarter here.

Signed-off-by: default avatarJiri 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: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1355749718-4355-3-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0bd3f084

tools/perf/util/parse-events.c

+46 −5
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ static int add_tracepoint(struct list_head **listp, int *idx, 
	return 0;

}



static int add_tracepoint_multi(struct list_head **list, int *idx,

static int add_tracepoint_multi_event(struct list_head **list, int *idx,

				      char *sys_name, char *evt_name)

{

	char evt_path[MAXPATHLEN];
@@ -412,6 +412,46 @@ static int add_tracepoint_multi(struct list_head **list, int *idx, 
	return ret;

}



static int add_tracepoint_event(struct list_head **list, int *idx,

				char *sys_name, char *evt_name)

{

	return strpbrk(evt_name, "*?") ?

	       add_tracepoint_multi_event(list, idx, sys_name, evt_name) :

	       add_tracepoint(list, idx, sys_name, evt_name);

}



static int add_tracepoint_multi_sys(struct list_head **list, int *idx,

				    char *sys_name, char *evt_name)

{

	struct dirent *events_ent;

	DIR *events_dir;

	int ret = 0;



	events_dir = opendir(tracing_events_path);

	if (!events_dir) {

		perror("Can't open event dir");

		return -1;

	}



	while (!ret && (events_ent = readdir(events_dir))) {

		if (!strcmp(events_ent->d_name, ".")

		    || !strcmp(events_ent->d_name, "..")

		    || !strcmp(events_ent->d_name, "enable")

		    || !strcmp(events_ent->d_name, "header_event")

		    || !strcmp(events_ent->d_name, "header_page"))

			continue;



		if (!strglobmatch(events_ent->d_name, sys_name))

			continue;



		ret = add_tracepoint_event(list, idx, events_ent->d_name,

					   evt_name);

	}



	closedir(events_dir);

	return ret;

}



int parse_events_add_tracepoint(struct list_head **list, int *idx,

				char *sys, char *event)

{
@@ -421,9 +461,10 @@ int parse_events_add_tracepoint(struct list_head **list, int *idx, 
	if (ret)

		return ret;



	return strpbrk(event, "*?") ?

	       add_tracepoint_multi(list, idx, sys, event) :

	       add_tracepoint(list, idx, sys, event);

	if (strpbrk(sys, "*?"))

		return add_tracepoint_multi_sys(list, idx, sys, event);

	else

		return add_tracepoint_event(list, idx, sys, event);

}



static int

CRA Git | Maintained and supported by SUSTech CRA and CCSE