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

libperf: Add perf_evlist__set_maps() function 



Move the evlist__set_maps() function from tools/perf to libperf.

Committer notes:

Fix up reject due to earlier inversion in calling perf_evlist__init().

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-57-jolsa@kernel.org


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

tools/perf/arch/x86/tests/perf-time-to-tsc.c

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/types.h>

#include <sys/prctl.h>

#include <perf/cpumap.h>

#include <perf/evlist.h>



#include "parse-events.h"

#include "evlist.h"
@@ -72,7 +73,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
	evlist = evlist__new();

	CHECK_NOT_NULL__(evlist);



	perf_evlist__set_maps(evlist, cpus, threads);

	perf_evlist__set_maps(&evlist->core, cpus, threads);



	CHECK__(parse_events(evlist, "cycles:u", NULL));

tools/perf/builtin-script.c

+2 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <fcntl.h>

#include <unistd.h>

#include <subcmd/pager.h>

#include <perf/evlist.h>



#include <linux/ctype.h>
@@ -3264,7 +3265,7 @@ static int set_maps(struct perf_script *script) 
	if (WARN_ONCE(script->allocated, "stats double allocation\n"))

		return -EINVAL;



	perf_evlist__set_maps(evlist, script->cpus, script->threads);

	perf_evlist__set_maps(&evlist->core, script->cpus, script->threads);



	if (perf_evlist__alloc_stats(evlist, true))

		return -ENOMEM;

tools/perf/builtin-stat.c

+2 −1
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#include <sys/resource.h>



#include <linux/ctype.h>

#include <perf/evlist.h>



#define DEFAULT_SEPARATOR	" "

#define FREEZE_ON_SMI_PATH	"devices/cpu/freeze_on_smi"
@@ -1517,7 +1518,7 @@ static int set_maps(struct perf_stat *st) 
	if (WARN_ONCE(st->maps_allocated, "stats double allocation\n"))

		return -EINVAL;



	perf_evlist__set_maps(evsel_list, st->cpus, st->threads);

	perf_evlist__set_maps(&evsel_list->core, st->cpus, st->threads);



	if (perf_evlist__alloc_stats(evsel_list, true))

		return -ENOMEM;

tools/perf/lib/evlist.c

+54 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include <internal/evsel.h>

#include <linux/zalloc.h>

#include <stdlib.h>

#include <perf/cpumap.h>

#include <perf/threadmap.h>



void perf_evlist__init(struct perf_evlist *evlist)

{
@@ -12,11 +14,39 @@ void perf_evlist__init(struct perf_evlist *evlist) 
	evlist->nr_entries = 0;

}



static void __perf_evlist__propagate_maps(struct perf_evlist *evlist,

					  struct perf_evsel *evsel)

{

	/*

	 * We already have cpus for evsel (via PMU sysfs) so

	 * keep it, if there's no target cpu list defined.

	 */

	if (!evsel->own_cpus || evlist->has_user_cpus) {

		perf_cpu_map__put(evsel->cpus);

		evsel->cpus = perf_cpu_map__get(evlist->cpus);

	} else if (evsel->cpus != evsel->own_cpus) {

		perf_cpu_map__put(evsel->cpus);

		evsel->cpus = perf_cpu_map__get(evsel->own_cpus);

	}



	perf_thread_map__put(evsel->threads);

	evsel->threads = perf_thread_map__get(evlist->threads);

}



static void perf_evlist__propagate_maps(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel;



	perf_evlist__for_each_evsel(evlist, evsel)

		__perf_evlist__propagate_maps(evlist, evsel);

}



void perf_evlist__add(struct perf_evlist *evlist,

		      struct perf_evsel *evsel)

{

	list_add_tail(&evsel->node, &evlist->entries);

	evlist->nr_entries += 1;

	__perf_evlist__propagate_maps(evlist, evsel);

}



void perf_evlist__remove(struct perf_evlist *evlist,
@@ -60,3 +90,27 @@ void perf_evlist__delete(struct perf_evlist *evlist) 
{

	free(evlist);

}



void perf_evlist__set_maps(struct perf_evlist *evlist,

			   struct perf_cpu_map *cpus,

			   struct perf_thread_map *threads)

{

	/*

	 * Allow for the possibility that one or another of the maps isn't being

	 * changed i.e. don't put it.  Note we are assuming the maps that are

	 * being applied are brand new and evlist is taking ownership of the

	 * original reference count of 1.  If that is not the case it is up to

	 * the caller to increase the reference count.

	 */

	if (cpus != evlist->cpus) {

		perf_cpu_map__put(evlist->cpus);

		evlist->cpus = perf_cpu_map__get(cpus);

	}



	if (threads != evlist->threads) {

		perf_thread_map__put(evlist->threads);

		evlist->threads = perf_thread_map__get(threads);

	}



	perf_evlist__propagate_maps(evlist);

}

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

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 


struct perf_evlist;

struct perf_evsel;

struct perf_cpu_map;

struct perf_thread_map;



LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist);

LIBPERF_API void perf_evlist__add(struct perf_evlist *evlist,
@@ -22,4 +24,8 @@ LIBPERF_API struct perf_evsel* perf_evlist__next(struct perf_evlist *evlist, 
	     (pos) != NULL;				\

	     (pos) = perf_evlist__next((evlist), (pos)))



LIBPERF_API void perf_evlist__set_maps(struct perf_evlist *evlist,

				       struct perf_cpu_map *cpus,

				       struct perf_thread_map *threads);



#endif /* __LIBPERF_EVLIST_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE