Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82fe1c29 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Use perf_evsel__newtp in the event parser 

Elliminating code duplication.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-9v4zl7ldlp8v6azrpsu5lupk@git.kernel.org


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

tools/perf/util/parse-events.c

+16 −30
Original line number Diff line number Diff line
@@ -356,42 +356,28 @@ int parse_events_add_cache(struct list_head **list, int *idx, 
	return add_event(list, idx, &attr, name);

}



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

static int add_tracepoint(struct list_head **listp, int *idx,

			  char *sys_name, char *evt_name)

{

	struct perf_event_attr attr;

	char name[MAX_NAME_LEN];

	char evt_path[MAXPATHLEN];

	char id_buf[4];

	u64 id;

	int fd;



	snprintf(evt_path, MAXPATHLEN, "%s/%s/%s/id", tracing_events_path,

		 sys_name, evt_name);



	fd = open(evt_path, O_RDONLY);

	if (fd < 0)

		return -1;

	struct perf_evsel *evsel;

	struct list_head *list = *listp;



	if (read(fd, id_buf, sizeof(id_buf)) < 0) {

		close(fd);

		return -1;

	if (!list) {

		list = malloc(sizeof(*list));

		if (!list)

			return -ENOMEM;

		INIT_LIST_HEAD(list);

	}



	close(fd);

	id = atoll(id_buf);



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

	attr.config = id;

	attr.type = PERF_TYPE_TRACEPOINT;

	attr.sample_type |= PERF_SAMPLE_RAW;

	attr.sample_type |= PERF_SAMPLE_TIME;

	attr.sample_type |= PERF_SAMPLE_CPU;

	attr.sample_type |= PERF_SAMPLE_PERIOD;

	attr.sample_period = 1;

	evsel = perf_evsel__newtp(sys_name, evt_name, (*idx)++);

	if (!evsel) {

		free(list);

		return -ENOMEM;

	}



	snprintf(name, MAX_NAME_LEN, "%s:%s", sys_name, evt_name);

	return add_event(list, idx, &attr, name);

	list_add_tail(&evsel->node, list);

	*listp = list;

	return 0;

}



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