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

libperf: Add perf_evlist__id_add_fd() function 



Add the perf_evlist__id_add_fd() function to libperf as an internal
function.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-32-jolsa@kernel.org


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

tools/perf/lib/evlist.c

+44 −0
Original line number Diff line number Diff line
@@ -4,11 +4,14 @@ 
#include <linux/bitops.h>

#include <linux/list.h>

#include <linux/hash.h>

#include <sys/ioctl.h>

#include <internal/evlist.h>

#include <internal/evsel.h>

#include <internal/xyarray.h>

#include <linux/zalloc.h>

#include <stdlib.h>

#include <errno.h>

#include <unistd.h>

#include <perf/cpumap.h>

#include <perf/threadmap.h>
@@ -194,3 +197,44 @@ void perf_evlist__id_add(struct perf_evlist *evlist, 
	perf_evlist__id_hash(evlist, evsel, cpu, thread, id);

	evsel->id[evsel->ids++] = id;

}



int perf_evlist__id_add_fd(struct perf_evlist *evlist,

			   struct perf_evsel *evsel,

			   int cpu, int thread, int fd)

{

	u64 read_data[4] = { 0, };

	int id_idx = 1; /* The first entry is the counter value */

	u64 id;

	int ret;



	ret = ioctl(fd, PERF_EVENT_IOC_ID, &id);

	if (!ret)

		goto add;



	if (errno != ENOTTY)

		return -1;



	/* Legacy way to get event id.. All hail to old kernels! */



	/*

	 * This way does not work with group format read, so bail

	 * out in that case.

	 */

	if (perf_evlist__read_format(evlist) & PERF_FORMAT_GROUP)

		return -1;



	if (!(evsel->attr.read_format & PERF_FORMAT_ID) ||

	    read(fd, &read_data, sizeof(read_data)) == -1)

		return -1;



	if (evsel->attr.read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)

		++id_idx;

	if (evsel->attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)

		++id_idx;



	id = read_data[id_idx];



add:

	perf_evlist__id_add(evlist, evsel, cpu, thread, id);

	return 0;

}

tools/perf/lib/include/internal/evlist.h

+4 −0
Original line number Diff line number Diff line
@@ -72,4 +72,8 @@ void perf_evlist__id_add(struct perf_evlist *evlist, 
			 struct perf_evsel *evsel,

			 int cpu, int thread, u64 id);



int perf_evlist__id_add_fd(struct perf_evlist *evlist,

			   struct perf_evsel *evsel,

			   int cpu, int thread, int fd);



#endif /* __LIBPERF_INTERNAL_EVLIST_H */

tools/perf/util/evlist.c

+1 −42
Original line number Diff line number Diff line
@@ -461,47 +461,6 @@ int perf_evlist__poll(struct evlist *evlist, int timeout) 
	return fdarray__poll(&evlist->core.pollfd, timeout);

}



int perf_evlist__id_add_fd(struct evlist *evlist,

			   struct evsel *evsel,

			   int cpu, int thread, int fd)

{

	u64 read_data[4] = { 0, };

	int id_idx = 1; /* The first entry is the counter value */

	u64 id;

	int ret;



	ret = ioctl(fd, PERF_EVENT_IOC_ID, &id);

	if (!ret)

		goto add;



	if (errno != ENOTTY)

		return -1;



	/* Legacy way to get event id.. All hail to old kernels! */



	/*

	 * This way does not work with group format read, so bail

	 * out in that case.

	 */

	if (perf_evlist__read_format(&evlist->core) & PERF_FORMAT_GROUP)

		return -1;



	if (!(evsel->core.attr.read_format & PERF_FORMAT_ID) ||

	    read(fd, &read_data, sizeof(read_data)) == -1)

		return -1;



	if (evsel->core.attr.read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)

		++id_idx;

	if (evsel->core.attr.read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)

		++id_idx;



	id = read_data[id_idx];



 add:

	perf_evlist__id_add(&evlist->core, &evsel->core, cpu, thread, id);

	return 0;

}



static void perf_evlist__set_sid_idx(struct evlist *evlist,

				     struct evsel *evsel, int idx, int cpu,

				     int thread)
@@ -776,7 +735,7 @@ static int evlist__mmap_per_evsel(struct evlist *evlist, int idx, 
		}



		if (evsel->core.attr.read_format & PERF_FORMAT_ID) {

			if (perf_evlist__id_add_fd(evlist, evsel, cpu, thread,

			if (perf_evlist__id_add_fd(&evlist->core, &evsel->core, cpu, thread,

						   fd) < 0)

				return -1;

			perf_evlist__set_sid_idx(evlist, evsel, idx, cpu,

tools/perf/util/evlist.h

+0 −4
Original line number Diff line number Diff line
@@ -141,10 +141,6 @@ struct evsel * 
perf_evlist__find_tracepoint_by_name(struct evlist *evlist,

				     const char *name);



int perf_evlist__id_add_fd(struct evlist *evlist,

			   struct evsel *evsel,

			   int cpu, int thread, int fd);



int perf_evlist__add_pollfd(struct evlist *evlist, int fd);

int perf_evlist__alloc_pollfd(struct evlist *evlist);

int perf_evlist__filter_pollfd(struct evlist *evlist, short revents_and_mask);

tools/perf/util/evsel.c

+1 −1
Original line number Diff line number Diff line
@@ -2662,7 +2662,7 @@ static int store_evsel_ids(struct evsel *evsel, struct evlist *evlist) 
		     thread++) {

			int fd = FD(evsel, cpu, thread);



			if (perf_evlist__id_add_fd(evlist, evsel,

			if (perf_evlist__id_add_fd(&evlist->core, &evsel->core,

						   cpu, thread, fd) < 0)

				return -1;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE