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

libperf: Add perf_evlist__id_add() function 



Add the perf_evlist__id_add() function to libperf as an internal
function.  We already have the 'heads' member in 'struct perf_evlist'.

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


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

tools/perf/lib/evlist.c

+26 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <perf/evlist.h>

#include <perf/evsel.h>

#include <linux/bitops.h>

#include <linux/list.h>

#include <linux/hash.h>

#include <internal/evlist.h>

#include <internal/evsel.h>

#include <internal/xyarray.h>

#include <linux/zalloc.h>

#include <stdlib.h>

#include <perf/cpumap.h>
@@ -168,3 +171,26 @@ u64 perf_evlist__read_format(struct perf_evlist *evlist) 


	return first->attr.read_format;

}



#define SID(e, x, y) xyarray__entry(e->sample_id, x, y)



static void perf_evlist__id_hash(struct perf_evlist *evlist,

				 struct perf_evsel *evsel,

				 int cpu, int thread, u64 id)

{

	int hash;

	struct perf_sample_id *sid = SID(evsel, cpu, thread);



	sid->id = id;

	sid->evsel = evsel;

	hash = hash_64(sid->id, PERF_EVLIST__HLIST_BITS);

	hlist_add_head(&sid->node, &evlist->heads[hash]);

}



void perf_evlist__id_add(struct perf_evlist *evlist,

			 struct perf_evsel *evsel,

			 int cpu, int thread, u64 id)

{

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

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

}

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

+4 −0
Original line number Diff line number Diff line
@@ -68,4 +68,8 @@ static inline struct perf_evsel *perf_evlist__last(struct perf_evlist *evlist) 


u64 perf_evlist__read_format(struct perf_evlist *evlist);



void perf_evlist__id_add(struct perf_evlist *evlist,

			 struct perf_evsel *evsel,

			 int cpu, int thread, u64 id);



#endif /* __LIBPERF_INTERNAL_EVLIST_H */

tools/perf/tests/event_update.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unu 
	TEST_ASSERT_VAL("failed to allocate ids",

			!perf_evsel__alloc_id(&evsel->core, 1, 1));



	perf_evlist__id_add(evlist, evsel, 0, 0, 123);

	perf_evlist__id_add(&evlist->core, &evsel->core, 0, 0, 123);



	evsel->unit = strdup("KRAVA");

tools/perf/util/evlist.c

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

}



static void perf_evlist__id_hash(struct evlist *evlist,

				 struct evsel *evsel,

				 int cpu, int thread, u64 id)

{

	int hash;

	struct perf_sample_id *sid = SID(evsel, cpu, thread);



	sid->id = id;

	sid->evsel = &evsel->core;

	hash = hash_64(sid->id, PERF_EVLIST__HLIST_BITS);

	hlist_add_head(&sid->node, &evlist->core.heads[hash]);

}



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->core.ids++] = id;

}



int perf_evlist__id_add_fd(struct evlist *evlist,

			   struct evsel *evsel,

			   int cpu, int thread, int fd)
@@ -518,7 +498,7 @@ int perf_evlist__id_add_fd(struct evlist *evlist, 
	id = read_data[id_idx];



 add:

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

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

	return 0;

}

tools/perf/util/evlist.h

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

				     const char *name);



void perf_evlist__id_add(struct evlist *evlist, struct evsel *evsel,

			 int cpu, int thread, u64 id);

int perf_evlist__id_add_fd(struct evlist *evlist,

			   struct evsel *evsel,

			   int cpu, int thread, int fd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE