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

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

perf evlist: Remove some unused methods 

Those were introduced in a previous attempt at implementing 'trace', but
are not being used anywhere, ditch them.

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-ruhm5gocoh32pb7gnr0ai6gh@git.kernel.org


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

tools/perf/util/evlist.c

+2 −84
Original line number Original line Diff line number Diff line
@@ -154,7 +154,7 @@ error: 
	return -ENOMEM;

	return -ENOMEM;

}

}





int perf_evlist__add_attrs(struct perf_evlist *evlist,

static int perf_evlist__add_attrs(struct perf_evlist *evlist,

				  struct perf_event_attr *attrs, size_t nr_attrs)

				  struct perf_event_attr *attrs, size_t nr_attrs)

{

{

	struct perf_evsel *evsel, *n;

	struct perf_evsel *evsel, *n;
@@ -189,60 +189,6 @@ int __perf_evlist__add_default_attrs(struct perf_evlist *evlist, 
	return perf_evlist__add_attrs(evlist, attrs, nr_attrs);

	return perf_evlist__add_attrs(evlist, attrs, nr_attrs);

}

}





static int trace_event__id(const char *evname)

{

	char *filename, *colon;

	int err = -1, fd;



	if (asprintf(&filename, "%s/%s/id", tracing_events_path, evname) < 0)

		return -1;



	colon = strrchr(filename, ':');

	if (colon != NULL)

		*colon = '/';



	fd = open(filename, O_RDONLY);

	if (fd >= 0) {

		char id[16];

		if (read(fd, id, sizeof(id)) > 0)

			err = atoi(id);

		close(fd);

	}



	free(filename);

	return err;

}



int perf_evlist__add_tracepoints(struct perf_evlist *evlist,

				 const char *tracepoints[],

				 size_t nr_tracepoints)

{

	int err;

	size_t i;

	struct perf_event_attr *attrs = zalloc(nr_tracepoints * sizeof(*attrs));



	if (attrs == NULL)

		return -1;



	for (i = 0; i < nr_tracepoints; i++) {

		err = trace_event__id(tracepoints[i]);



		if (err < 0)

			goto out_free_attrs;



		attrs[i].type	       = PERF_TYPE_TRACEPOINT;

		attrs[i].config	       = err;

	        attrs[i].sample_type   = (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME |

					  PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD);

		attrs[i].sample_period = 1;

	}



	err = perf_evlist__add_attrs(evlist, attrs, nr_tracepoints);

out_free_attrs:

	free(attrs);

	return err;

}



struct perf_evsel *

struct perf_evsel *

perf_evlist__find_tracepoint_by_id(struct perf_evlist *evlist, int id)

perf_evlist__find_tracepoint_by_id(struct perf_evlist *evlist, int id)

{

{
@@ -257,34 +203,6 @@ perf_evlist__find_tracepoint_by_id(struct perf_evlist *evlist, int id) 
	return NULL;

	return NULL;

}

}





int perf_evlist__set_tracepoints_handlers(struct perf_evlist *evlist,

					  const struct perf_evsel_str_handler *assocs,

					  size_t nr_assocs)

{

	struct perf_evsel *evsel;

	int err;

	size_t i;



	for (i = 0; i < nr_assocs; i++) {

		err = trace_event__id(assocs[i].name);

		if (err < 0)

			goto out;



		evsel = perf_evlist__find_tracepoint_by_id(evlist, err);

		if (evsel == NULL)

			continue;



		err = -EEXIST;

		if (evsel->handler.func != NULL)

			goto out;

		evsel->handler.func = assocs[i].handler;

	}



	err = 0;

out:

	return err;

}



int perf_evlist__add_newtp(struct perf_evlist *evlist,

int perf_evlist__add_newtp(struct perf_evlist *evlist,

			   const char *sys, const char *name, void *handler)

			   const char *sys, const char *name, void *handler)

{

{

tools/perf/util/evlist.h

+1 −16
Original line number Original line Diff line number Diff line
@@ -51,27 +51,12 @@ void perf_evlist__delete(struct perf_evlist *evlist); 




void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry);

void perf_evlist__add(struct perf_evlist *evlist, struct perf_evsel *entry);

int perf_evlist__add_default(struct perf_evlist *evlist);

int perf_evlist__add_default(struct perf_evlist *evlist);

int perf_evlist__add_attrs(struct perf_evlist *evlist,

			   struct perf_event_attr *attrs, size_t nr_attrs);

int __perf_evlist__add_default_attrs(struct perf_evlist *evlist,

int __perf_evlist__add_default_attrs(struct perf_evlist *evlist,

				     struct perf_event_attr *attrs, size_t nr_attrs);

				     struct perf_event_attr *attrs, size_t nr_attrs);

int perf_evlist__add_tracepoints(struct perf_evlist *evlist,



				 const char *tracepoints[], size_t nr_tracepoints);

int perf_evlist__set_tracepoints_handlers(struct perf_evlist *evlist,

					  const struct perf_evsel_str_handler *assocs,

					  size_t nr_assocs);



#define perf_evlist__add_attrs_array(evlist, array) \

	perf_evlist__add_attrs(evlist, array, ARRAY_SIZE(array))

#define perf_evlist__add_default_attrs(evlist, array) \

#define perf_evlist__add_default_attrs(evlist, array) \

	__perf_evlist__add_default_attrs(evlist, array, ARRAY_SIZE(array))

	__perf_evlist__add_default_attrs(evlist, array, ARRAY_SIZE(array))





#define perf_evlist__add_tracepoints_array(evlist, array) \

	perf_evlist__add_tracepoints(evlist, array, ARRAY_SIZE(array))



#define perf_evlist__set_tracepoints_handlers_array(evlist, array) \

	perf_evlist__set_tracepoints_handlers(evlist, array, ARRAY_SIZE(array))



int perf_evlist__add_newtp(struct perf_evlist *evlist,

int perf_evlist__add_newtp(struct perf_evlist *evlist,

			   const char *sys, const char *name, void *handler);

			   const char *sys, const char *name, void *handler);