public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Andi Kleen <ak@linux.intel.com>, David Ahern <dsahern@gmail.com>,
	Ingo Molnar <mingo@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Stephane Eranian <eranian@google.com>
Subject: [PATCH 16/30] perf stat: Rename struct perf_counts::cpu member to values
Date: Sun, 14 Jun 2015 10:19:31 +0200	[thread overview]
Message-ID: <1434269985-521-17-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1434269985-521-1-git-send-email-jolsa@kernel.org>

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/stat.c | 12 ++++++------
 tools/perf/util/stat.h |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 7bcc19b62dd1..197a2db5f2c4 100644
--- 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 e0b8dc50fbb6..295d1e29d3d6 100644
--- 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);
-- 
1.9.3


  parent reply	other threads:[~2015-06-14  8:21 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-14  8:19 [PATCHv2 00/30] perf stat: Introduce --per-task option Jiri Olsa
2015-06-14  8:19 ` [PATCH 01/30] perf tools: Introduce xyarray__reset function Jiri Olsa
2015-06-18  8:13   ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-06-14  8:19 ` [PATCH 02/30] perf tools: Add thread_map__(alloc|realloc) helpers Jiri Olsa
2015-06-18  8:14   ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-06-14  8:19 ` [PATCH 03/30] perf tools: Change thread_map::map into struct Jiri Olsa
2015-06-15 19:04   ` Arnaldo Carvalho de Melo
2015-06-15 21:33     ` Jiri Olsa
2015-06-14  8:19 ` [PATCH 04/30] perf tools: Add comm string into struct thread_map Jiri Olsa
2015-06-15 19:17   ` Arnaldo Carvalho de Melo
2015-06-15 21:55     ` Jiri Olsa
2015-06-14  8:19 ` [PATCH 05/30] perf tests: Add thread_map object tests Jiri Olsa
2015-06-14  8:19 ` [PATCH 06/30] perf tools: Add reference counting for cpu_map object Jiri Olsa
2015-06-14  8:19 ` [PATCH 07/30] perf tools: Add reference counting for thread_map object Jiri Olsa
2015-06-15 19:25   ` Arnaldo Carvalho de Melo
2015-06-15 21:28     ` Jiri Olsa
2015-06-14  8:19 ` [PATCH 08/30] perf tools: Propagate cpu maps through the evlist Jiri Olsa
2015-06-15 19:34   ` Arnaldo Carvalho de Melo
2015-06-15 21:29     ` Jiri Olsa
2015-06-14  8:19 ` [PATCH 09/30] perf tools: Propagate thread " Jiri Olsa
2015-06-14  8:19 ` [PATCH 10/30] perf tools: Make perf_evsel__(nr_)cpus generic Jiri Olsa
2015-06-14  8:19 ` [PATCH 11/30] perf tools: Move perf_evsel__(alloc|free|reset)_counts into stat object Jiri Olsa
2015-06-15 20:13   ` Arnaldo Carvalho de Melo
2015-06-18  8:14   ` [tip:perf/core] perf tools: Move perf_evsel__(alloc|free|reset) _counts " tip-bot for Jiri Olsa
2015-06-14  8:19 ` [PATCH 12/30] perf stat: Introduce perf_counts__(alloc|free|reset) functions Jiri Olsa
2015-06-15 20:16   ` Arnaldo Carvalho de Melo
2015-06-18  8:14   ` [tip:perf/core] perf stat: Introduce perf_counts__( new|delete|reset) functions tip-bot for Jiri Olsa
2015-06-14  8:19 ` [PATCH 13/30] perf stat: Introduce perf_counts function Jiri Olsa
2015-06-14  8:19 ` [PATCH 14/30] perf stat: Use xyarray for cpu evsel counts Jiri Olsa
2015-06-14  8:19 ` [PATCH 15/30] perf stat: Make stats work over the thread dimension Jiri Olsa
2015-06-14  8:19 ` Jiri Olsa [this message]
2015-06-14  8:19 ` [PATCH 17/30] perf stat: Move perf_evsel__(alloc|free|reset)_stat_priv into stat object Jiri Olsa
2015-06-14  8:19 ` [PATCH 18/30] perf stat: Move perf_evsel__(alloc|free)_prev_raw_counts " Jiri Olsa
2015-06-14  8:19 ` [PATCH 19/30] perf stat: Move perf_evlist__(alloc|free)_stats into evlist object Jiri Olsa
2015-06-14  8:19 ` [PATCH 20/30] perf stat: Introduce perf_evsel__alloc_stats function Jiri Olsa
2015-06-14  8:19 ` [PATCH 21/30] perf stat: Introduce perf_evsel__read function Jiri Olsa
2015-06-14  8:19 ` [PATCH 22/30] perf stat: Introduce read_counters function Jiri Olsa
2015-06-14  8:19 ` [PATCH 23/30] perf stat: Separate counters reading and processing Jiri Olsa
2015-06-14  8:19 ` [PATCH 24/30] perf stat: Move zero_per_pkg into counter process code Jiri Olsa
2015-06-14  8:19 ` [PATCH 25/30] perf stat: Move perf_stat initialization " Jiri Olsa
2015-06-14  8:19 ` [PATCH 26/30] perf stat: Remove perf_evsel__read_cb function Jiri Olsa
2015-06-14  8:19 ` [PATCH 27/30] perf stat: Rename print_interval to process_interval Jiri Olsa
2015-06-14  8:19 ` [PATCH 28/30] perf stat: Using init_stats instead of memset Jiri Olsa
2015-06-14  8:19 ` [PATCH 29/30] perf stat: Introduce print_counters function Jiri Olsa
2015-06-14  8:19 ` [PATCH 30/30] perf stat: Introduce --per-task option Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1434269985-521-17-git-send-email-jolsa@kernel.org \
    --to=jolsa@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=dsahern@gmail.com \
    --cc=eranian@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox