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

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

perf tools: Remove perf_evsel__read interface 



Removing the perf_evsel__read interfaces because we replaced the only
user in the stat command code.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1416562275-12404-8-git-send-email-jolsa@kernel.org


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

tools/perf/util/evsel.c

+0 −34
Original line number Diff line number Diff line
@@ -954,40 +954,6 @@ int __perf_evsel__read_on_cpu(struct perf_evsel *evsel, 
	return 0;

}



int __perf_evsel__read(struct perf_evsel *evsel,

		       int ncpus, int nthreads, bool scale)

{

	size_t nv = scale ? 3 : 1;

	int cpu, thread;

	struct perf_counts_values *aggr = &evsel->counts->aggr, count;



	if (evsel->system_wide)

		nthreads = 1;



	aggr->val = aggr->ena = aggr->run = 0;



	for (cpu = 0; cpu < ncpus; cpu++) {

		for (thread = 0; thread < nthreads; thread++) {

			if (FD(evsel, cpu, thread) < 0)

				continue;



			if (readn(FD(evsel, cpu, thread),

				  &count, nv * sizeof(u64)) < 0)

				return -errno;



			aggr->val += count.val;

			if (scale) {

				aggr->ena += count.ena;

				aggr->run += count.run;

			}

		}

	}



	perf_evsel__compute_deltas(evsel, -1, aggr);

	perf_counts_values__scale(aggr, scale, &evsel->counts->scaled);

	return 0;

}



static int get_group_fd(struct perf_evsel *evsel, int cpu, int thread)

{

	struct perf_evsel *leader = evsel->leader;

tools/perf/util/evsel.h

+0 −29
Original line number Diff line number Diff line
@@ -271,35 +271,6 @@ static inline int perf_evsel__read_on_cpu_scaled(struct perf_evsel *evsel, 
	return __perf_evsel__read_on_cpu(evsel, cpu, thread, true);

}



int __perf_evsel__read(struct perf_evsel *evsel, int ncpus, int nthreads,

		       bool scale);



/**

 * perf_evsel__read - Read the aggregate results on all CPUs

 *

 * @evsel - event selector to read value

 * @ncpus - Number of cpus affected, from zero

 * @nthreads - Number of threads affected, from zero

 */

static inline int perf_evsel__read(struct perf_evsel *evsel,

				    int ncpus, int nthreads)

{

	return __perf_evsel__read(evsel, ncpus, nthreads, false);

}



/**

 * perf_evsel__read_scaled - Read the aggregate results on all CPUs, scaled

 *

 * @evsel - event selector to read value

 * @ncpus - Number of cpus affected, from zero

 * @nthreads - Number of threads affected, from zero

 */

static inline int perf_evsel__read_scaled(struct perf_evsel *evsel,

					  int ncpus, int nthreads)

{

	return __perf_evsel__read(evsel, ncpus, nthreads, true);

}



int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event,

			     struct perf_sample *sample);