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

libperf: Move 'ids' from 'struct evsel' to 'struct perf_evsel' 



Move 'ids' from 'struct evsel' to libperf's 'struct perf_evsel'.

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-26-jolsa@kernel.org


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

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

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ struct perf_evsel { 
	struct xyarray		*fd;

	struct xyarray		*sample_id;

	u64			*id;

	u32			 ids;



	/* parse modifier helper */

	int			 nr_members;

tools/perf/util/evlist.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ void perf_evlist__id_add(struct evlist *evlist, struct evsel *evsel, 
			 int cpu, int thread, u64 id)

{

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

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

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

}



int perf_evlist__id_add_fd(struct evlist *evlist,

tools/perf/util/evsel.c

+1 −1
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ static void perf_evsel__free_id(struct evsel *evsel) 
	xyarray__delete(evsel->core.sample_id);

	evsel->core.sample_id = NULL;

	zfree(&evsel->core.id);

	evsel->ids = 0;

	evsel->core.ids = 0;

}



static void perf_evsel__free_config_terms(struct evsel *evsel)

tools/perf/util/evsel.h

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ struct evsel { 
	struct perf_counts	*counts;

	struct perf_counts	*prev_raw_counts;

	int			idx;

	u32			ids;

	unsigned long		max_events;

	unsigned long		nr_events_printed;

	char			*name;

tools/perf/util/header.c

+7 −7
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int write_event_desc(struct feat_fd *ff, 
		 * copy into an nri to be independent of the

		 * type of ids,

		 */

		nri = evsel->ids;

		nri = evsel->core.ids;

		ret = do_write(ff, &nri, sizeof(nri));

		if (ret < 0)

			return ret;
@@ -530,7 +530,7 @@ static int write_event_desc(struct feat_fd *ff, 
		/*

		 * write unique ids for this event

		 */

		ret = do_write(ff, evsel->core.id, evsel->ids * sizeof(u64));

		ret = do_write(ff, evsel->core.id, evsel->core.ids * sizeof(u64));

		if (ret < 0)

			return ret;

	}
@@ -1656,7 +1656,7 @@ static struct evsel *read_event_desc(struct feat_fd *ff) 
		id = calloc(nr, sizeof(*id));

		if (!id)

			goto error;

		evsel->ids = nr;

		evsel->core.ids = nr;

		evsel->core.id = id;



		for (j = 0 ; j < nr; j++) {
@@ -1699,9 +1699,9 @@ static void print_event_desc(struct feat_fd *ff, FILE *fp) 
	for (evsel = events; evsel->core.attr.size; evsel++) {

		fprintf(fp, "# event : name = %s, ", evsel->name);



		if (evsel->ids) {

		if (evsel->core.ids) {

			fprintf(fp, ", id = {");

			for (j = 0, id = evsel->core.id; j < evsel->ids; j++, id++) {

			for (j = 0, id = evsel->core.id; j < evsel->core.ids; j++, id++) {

				if (j)

					fputc(',', fp);

				fprintf(fp, " %"PRIu64, *id);
@@ -3068,7 +3068,7 @@ int perf_session__write_header(struct perf_session *session, 


	evlist__for_each_entry(session->evlist, evsel) {

		evsel->id_offset = lseek(fd, 0, SEEK_CUR);

		err = do_write(&ff, evsel->core.id, evsel->ids * sizeof(u64));

		err = do_write(&ff, evsel->core.id, evsel->core.ids * sizeof(u64));

		if (err < 0) {

			pr_debug("failed to write perf header\n");

			return err;
@@ -3082,7 +3082,7 @@ int perf_session__write_header(struct perf_session *session, 
			.attr = evsel->core.attr,

			.ids  = {

				.offset = evsel->id_offset,

				.size   = evsel->ids * sizeof(u64),

				.size   = evsel->core.ids * sizeof(u64),

			}

		};

		err = do_write(&ff, &f_attr, sizeof(f_attr));

CRA Git | Maintained and supported by SUSTech CRA and CCSE