Skip to content

Commit

Permalink
perf stat: Rename struct perf_counts::cpu member to values
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Olsa authored and Arnaldo Carvalho de Melo committed Jun 26, 2015
1 parent a6fa003 commit 57b2891
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions tools/perf/util/stat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/stat.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 57b2891

Please sign in to comment.