perf stat: Rename struct perf_counts::cpu member to values

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

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1435310967-14570-8-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 7bcc19b62dd1f44e44a977b8a93520a4fbe8a7aa..197a2db5f2c4f18bc24852bad269b14f78beca47 100644 (file)
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -100,15 +100,15 @@ struct perf_counts *perf_counts__new(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;
@@ -117,14 +117,14 @@ struct perf_counts *perf_counts__new(int ncpus, int nthreads)
 void perf_counts__delete(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__reset(counts->cpu);
+       xyarray__reset(counts->values);
 }
 
 void perf_evsel__reset_counts(struct perf_evsel *evsel)

diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index e0b8dc50fbb6136ed258abf01ea478d6f51b4976..295d1e29d3d617276747de92b538813a0c0ab5b6 100644 (file)
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -46,13 +46,13 @@ struct perf_counts_values {
 struct perf_counts {
        s8                        scaled;
        struct perf_counts_values aggr;
-       struct xyarray            *cpu;
+       struct xyarray            *values;
 };
 
 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);
 }
 
 void update_stats(struct stats *stats, u64 val);