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

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

libperf: Add perf_cpu_map__new()/perf_cpu_map__read() functions 



Moving the following functions from tools/perf:

  cpu_map__new()
  cpu_map__read()

to libperf with the following names:

  perf_cpu_map__new()
  perf_cpu_map__read()

Committer notes:

Fixed up this one:

  tools/perf/arch/arm/util/cs-etm.c

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


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

tools/perf/arch/arm/util/cs-etm.c

+3 −3
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static int cs_etm_set_option(struct auxtrace_record *itr, 
{

	int i, err = -EINVAL;

	struct perf_cpu_map *event_cpus = evsel->evlist->cpus;

	struct perf_cpu_map *online_cpus = cpu_map__new(NULL);

	struct perf_cpu_map *online_cpus = perf_cpu_map__new(NULL);



	/* Set option of each CPU we have */

	for (i = 0; i < cpu__max_cpu(); i++) {
@@ -490,7 +490,7 @@ cs_etm_info_priv_size(struct auxtrace_record *itr __maybe_unused, 
	int i;

	int etmv3 = 0, etmv4 = 0;

	struct perf_cpu_map *event_cpus = evlist->cpus;

	struct perf_cpu_map *online_cpus = cpu_map__new(NULL);

	struct perf_cpu_map *online_cpus = perf_cpu_map__new(NULL);



	/* cpu map is not empty, we have specific CPUs to work with */

	if (!cpu_map__empty(event_cpus)) {
@@ -637,7 +637,7 @@ static int cs_etm_info_fill(struct auxtrace_record *itr, 
	u64 nr_cpu, type;

	struct perf_cpu_map *cpu_map;

	struct perf_cpu_map *event_cpus = session->evlist->cpus;

	struct perf_cpu_map *online_cpus = cpu_map__new(NULL);

	struct perf_cpu_map *online_cpus = perf_cpu_map__new(NULL);

	struct cs_etm_recording *ptr =

			container_of(itr, struct cs_etm_recording, itr);

	struct perf_pmu *cs_etm_pmu = ptr->cs_etm_pmu;

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

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

#include <linux/types.h>

#include <sys/prctl.h>

#include <perf/cpumap.h>



#include "parse-events.h"

#include "evlist.h"
@@ -65,7 +66,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
	threads = thread_map__new(-1, getpid(), UINT_MAX);

	CHECK_NOT_NULL__(threads);



	cpus = cpu_map__new(NULL);

	cpus = perf_cpu_map__new(NULL);

	CHECK_NOT_NULL__(cpus);



	evlist = evlist__new();

tools/perf/bench/epoll-ctl.c

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

#include <sys/epoll.h>

#include <sys/eventfd.h>

#include <perf/cpumap.h>



#include "../util/stat.h"

#include <subcmd/parse-options.h>
@@ -315,7 +316,7 @@ int bench_epoll_ctl(int argc, const char **argv) 
	act.sa_sigaction = toggle_done;

	sigaction(SIGINT, &act, NULL);



	cpu = cpu_map__new(NULL);

	cpu = perf_cpu_map__new(NULL);

	if (!cpu)

		goto errmem;

tools/perf/bench/epoll-wait.c

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

#include <sys/eventfd.h>

#include <sys/types.h>

#include <perf/cpumap.h>



#include "../util/stat.h"

#include <subcmd/parse-options.h>
@@ -429,7 +430,7 @@ int bench_epoll_wait(int argc, const char **argv) 
	act.sa_sigaction = toggle_done;

	sigaction(SIGINT, &act, NULL);



	cpu = cpu_map__new(NULL);

	cpu = perf_cpu_map__new(NULL);

	if (!cpu)

		goto errmem;

tools/perf/bench/futex-hash.c

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

#include <linux/zalloc.h>

#include <sys/time.h>

#include <perf/cpumap.h>



#include "../util/stat.h"

#include <subcmd/parse-options.h>
@@ -132,7 +133,7 @@ int bench_futex_hash(int argc, const char **argv) 
		exit(EXIT_FAILURE);

	}



	cpu = cpu_map__new(NULL);

	cpu = perf_cpu_map__new(NULL);

	if (!cpu)

		goto errmem;