[PATCH 12/25] perf stat: Rename struct perf_counts::cpu member to values

Jiri Olsa
2015-06-10T18:13:54Z

Renaming 'struct xyarray *cpu' pointer to more fitting/generic
values, because now we store both cpu and thread values.

Link: http://lkml.kernel.org/n/tip-fee055ta61vlnjfjzurmy6qi@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/evsel.c | 12 ++++++------
tools/perf/util/evsel.h | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index b9f798732866..a5409d39392e 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -856,15 +856,15 @@ struct perf_counts *perf_counts__alloc(int ncpus, int nthreads)
struct perf_counts *counts = zalloc(sizeof(*counts));

if (counts) {
- struct xyarray *cpu;
+ struct xyarray *values;

- cpu = xyarray__new(ncpus, nthreads, sizeof(struct perf_counts_values));
- if (!cpu) {
+ values = xyarray__new(ncpus, nthreads, sizeof(struct perf_counts_values));
+ if (!values) {
free(counts);
return NULL;
}

- counts->cpu = cpu;
+ counts->values = values;
}

return counts;
@@ -873,14 +873,14 @@ struct perf_counts *perf_counts__alloc(int ncpus, int nthreads)
void perf_counts__free(struct perf_counts *counts)
{
if (counts) {
- xyarray__delete(counts->cpu);
+ xyarray__delete(counts->values);
free(counts);
}
}

static void perf_counts__reset(struct perf_counts *counts)
{
- xyarray__zero(counts->cpu);
+ xyarray__zero(counts->values);
}

void perf_evsel__reset_counts(struct perf_evsel *evsel)
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 5e3a9d875137..0d495bd161c3 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -24,7 +24,7 @@ struct perf_counts_values {
struct perf_counts {
s8 scaled;
struct perf_counts_values aggr;
- struct xyarray *cpu;
+ struct xyarray *values;
};

struct perf_evsel;
@@ -137,7 +137,7 @@ void perf_counts__free(struct perf_counts *counts);
static inline struct perf_counts_values*
perf_counts(struct perf_counts *counts, int cpu, int thread)
{
- return xyarray__entry(counts->cpu, cpu, thread);
+ return xyarray__entry(counts->values, cpu, thread);
}

int perf_evsel__object_config(size_t object_size,
--
1.9.3