From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
"Liang, Kan" <kan.liang@intel.com>
Subject: [PATCH 29/45] perf tools: Add data arg to cpu_map__build_map callback
Date: Wed, 30 Sep 2015 16:10:42 +0200 [thread overview]
Message-ID: <1443622258-17158-30-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1443622258-17158-1-git-send-email-jolsa@kernel.org>
Adding data arg to cpu_map__build_map callback, so we could
pass data along to the callback. It'll be needed in following
patches to retrieve topology info from perf.data.
Link: http://lkml.kernel.org/n/tip-tv914j1vjnexg3fhq0q55h23@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-stat.c | 14 ++++++++++++--
tools/perf/tests/topology.c | 4 ++--
tools/perf/util/cpumap.c | 15 ++++++++-------
tools/perf/util/cpumap.h | 7 ++++---
tools/perf/util/stat.c | 2 +-
5 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 5d53f7d1a2d4..9982f09dff09 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1099,6 +1099,16 @@ static int stat__set_big_num(const struct option *opt __maybe_unused,
return 0;
}
+static int perf_stat__get_socket(struct cpu_map *map, int cpu)
+{
+ return cpu_map__get_socket(map, cpu, NULL);
+}
+
+static int perf_stat__get_core(struct cpu_map *map, int cpu)
+{
+ return cpu_map__get_core(map, cpu, NULL);
+}
+
static int perf_stat_init_aggr_mode(void)
{
switch (stat_config.aggr_mode) {
@@ -1107,14 +1117,14 @@ static int perf_stat_init_aggr_mode(void)
perror("cannot build socket map");
return -1;
}
- aggr_get_id = cpu_map__get_socket;
+ aggr_get_id = perf_stat__get_socket;
break;
case AGGR_CORE:
if (cpu_map__build_core_map(evsel_list->cpus, &aggr_map)) {
perror("cannot build core map");
return -1;
}
- aggr_get_id = cpu_map__get_core;
+ aggr_get_id = perf_stat__get_core;
break;
case AGGR_NONE:
case AGGR_GLOBAL:
diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
index c3aff53a976a..f5bb096c3bd9 100644
--- a/tools/perf/tests/topology.c
+++ b/tools/perf/tests/topology.c
@@ -73,10 +73,10 @@ static int check_cpu_topology(char *path, struct cpu_map *map)
for (i = 0; i < map->nr; i++) {
TEST_ASSERT_VAL("Core ID doesn't match",
- (session->header.env.cpu[map->map[i]].core_id == (cpu_map__get_core(map, i) & 0xffff)));
+ (session->header.env.cpu[map->map[i]].core_id == (cpu_map__get_core(map, i, NULL) & 0xffff)));
TEST_ASSERT_VAL("Socket ID doesn't match",
- (session->header.env.cpu[map->map[i]].socket_id == cpu_map__get_socket(map, i)));
+ (session->header.env.cpu[map->map[i]].socket_id == cpu_map__get_socket(map, i, NULL)));
}
perf_session__delete(session);
diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index 6d0a2ddf4eba..52d3f8bbf733 100644
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -285,7 +285,7 @@ int cpu_map__get_socket_id(int cpu)
return ret ?: value;
}
-int cpu_map__get_socket(struct cpu_map *map, int idx)
+int cpu_map__get_socket(struct cpu_map *map, int idx, void *data __maybe_unused)
{
int cpu;
@@ -303,7 +303,8 @@ static int cmp_ids(const void *a, const void *b)
}
int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,
- int (*f)(struct cpu_map *map, int cpu))
+ int (*f)(struct cpu_map *map, int cpu, void *data),
+ void *data)
{
struct cpu_map *c;
int nr = cpus->nr;
@@ -315,7 +316,7 @@ int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,
return -1;
for (cpu = 0; cpu < nr; cpu++) {
- s1 = f(cpus, cpu);
+ s1 = f(cpus, cpu, data);
for (s2 = 0; s2 < c->nr; s2++) {
if (s1 == c->map[s2])
break;
@@ -339,7 +340,7 @@ int cpu_map__get_core_id(int cpu)
return ret ?: value;
}
-int cpu_map__get_core(struct cpu_map *map, int idx)
+int cpu_map__get_core(struct cpu_map *map, int idx, void *data)
{
int cpu, s;
@@ -350,7 +351,7 @@ int cpu_map__get_core(struct cpu_map *map, int idx)
cpu = cpu_map__get_core_id(cpu);
- s = cpu_map__get_socket(map, idx);
+ s = cpu_map__get_socket(map, idx, data);
if (s == -1)
return -1;
@@ -365,12 +366,12 @@ int cpu_map__get_core(struct cpu_map *map, int idx)
int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp)
{
- return cpu_map__build_map(cpus, sockp, cpu_map__get_socket);
+ return cpu_map__build_map(cpus, sockp, cpu_map__get_socket, NULL);
}
int cpu_map__build_core_map(struct cpu_map *cpus, struct cpu_map **corep)
{
- return cpu_map__build_map(cpus, corep, cpu_map__get_core);
+ return cpu_map__build_map(cpus, corep, cpu_map__get_core, NULL);
}
/* setup simple routines to easily access node numbers given a cpu number */
diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index 74f0151c3fab..a44eab0083bd 100644
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -23,9 +23,9 @@ struct cpu_map *cpu_map__new_event(struct cpu_map_event *event);
struct cpu_map *cpu_map__read(FILE *file);
size_t cpu_map__fprintf(struct cpu_map *map, FILE *fp);
int cpu_map__get_socket_id(int cpu);
-int cpu_map__get_socket(struct cpu_map *map, int idx);
+int cpu_map__get_socket(struct cpu_map *map, int idx, void *data);
int cpu_map__get_core_id(int cpu);
-int cpu_map__get_core(struct cpu_map *map, int idx);
+int cpu_map__get_core(struct cpu_map *map, int idx, void *data);
int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp);
int cpu_map__build_core_map(struct cpu_map *cpus, struct cpu_map **corep);
@@ -92,5 +92,6 @@ static inline int cpu__get_node(int cpu)
}
int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,
- int (*f)(struct cpu_map *map, int cpu));
+ int (*f)(struct cpu_map *map, int cpu, void *data),
+ void *data);
#endif /* __PERF_CPUMAP_H */
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 677620acd2bd..40fa99b640f8 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -230,7 +230,7 @@ static int check_per_pkg(struct perf_evsel *counter,
if (!(vals->run && vals->ena))
return 0;
- s = cpu_map__get_socket(cpus, cpu);
+ s = cpu_map__get_socket(cpus, cpu, NULL);
if (s < 0)
return -1;
--
2.4.3
next prev parent reply other threads:[~2015-09-30 14:18 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 14:10 [PATCHv2 00/45] perf stat: Add scripting support Jiri Olsa
2015-09-30 14:10 ` [PATCH 01/45] perf tools: Add thread_map event Jiri Olsa
2015-09-30 14:10 ` [PATCH 02/45] perf tools: Add thread_map event synthesize function Jiri Olsa
2015-09-30 14:10 ` [PATCH 03/45] perf tools: Add thread_map__new_event function Jiri Olsa
2015-09-30 14:10 ` [PATCH 04/45] perf tools: Add cpu_map event Jiri Olsa
2015-09-30 14:10 ` [PATCH 05/45] perf tools: Add cpu_map event synthesize function Jiri Olsa
2015-09-30 14:10 ` [PATCH 06/45] perf tools: Add cpu_map__new_event function Jiri Olsa
2015-09-30 14:10 ` [PATCH 07/45] perf tools: Add stat config event Jiri Olsa
2015-09-30 14:10 ` [PATCH 08/45] perf tools: Add stat config event synthesize function Jiri Olsa
2015-09-30 14:10 ` [PATCH 09/45] perf tools: Add stat config event read function Jiri Olsa
2015-09-30 14:10 ` [PATCH 10/45] perf tools: Add stat event Jiri Olsa
2015-09-30 14:10 ` [PATCH 11/45] perf tools: Add stat event synthesize function Jiri Olsa
2015-09-30 14:10 ` [PATCH 12/45] perf tools: Add stat event read function Jiri Olsa
2015-09-30 14:10 ` [PATCH 13/45] perf tools: Add stat round event Jiri Olsa
2015-09-30 14:10 ` [PATCH 14/45] perf tools: Add stat round event synthesize function Jiri Olsa
2015-09-30 14:10 ` [PATCH 15/45] perf tools: Introduce stat feature Jiri Olsa
2015-09-30 14:10 ` [PATCH 16/45] perf tools: Move id_offset out of struct perf_evsel union Jiri Olsa
2015-09-30 14:10 ` [PATCH 17/45] perf stat: Rename perf_stat struct into perf_stat_evsel Jiri Olsa
2015-09-30 14:10 ` [PATCH 18/45] perf stat: Add AGGR_UNSET mode Jiri Olsa
2015-09-30 14:10 ` [PATCH 19/45] perf stat record: Add record command Jiri Olsa
2015-09-30 14:10 ` [PATCH 20/45] perf stat record: Initialize record features Jiri Olsa
2015-09-30 14:10 ` [PATCH 21/45] perf stat record: Synthesize stat record data Jiri Olsa
2015-09-30 14:10 ` [PATCH 22/45] perf stat record: Store events IDs in perf data file Jiri Olsa
2015-09-30 14:10 ` [PATCH 23/45] perf stat record: Add pipe support for record command Jiri Olsa
2015-09-30 14:10 ` [PATCH 24/45] perf stat record: Write stat events on record Jiri Olsa
2015-09-30 14:10 ` [PATCH 25/45] perf stat record: Write stat round " Jiri Olsa
2015-09-30 14:10 ` [PATCH 26/45] perf stat record: Do not allow record with multiple runs mode Jiri Olsa
2015-09-30 14:10 ` [PATCH 27/45] perf tools: Add cpu_map__empty_new interface Jiri Olsa
2015-09-30 14:10 ` [PATCH 28/45] perf tools: Make cpu_map__build_map global Jiri Olsa
2015-09-30 14:10 ` Jiri Olsa [this message]
2015-09-30 14:10 ` [PATCH 30/45] perf stat report: Cache aggregated map entries in extra cpumap Jiri Olsa
2015-09-30 14:10 ` [PATCH 31/45] perf stat report: Add report command Jiri Olsa
2015-09-30 14:10 ` [PATCH 32/45] perf stat report: Process cpu/threads maps Jiri Olsa
2015-09-30 14:10 ` [PATCH 33/45] perf stat report: Process stat config event Jiri Olsa
2015-09-30 14:10 ` [PATCH 34/45] perf stat report: Add support to initialize aggr_map from file Jiri Olsa
2015-09-30 14:10 ` [PATCH 35/45] perf stat report: Process stat and stat round events Jiri Olsa
2015-09-30 14:10 ` [PATCH 36/45] perf stat report: Move csv_sep initialization before report command Jiri Olsa
2015-09-30 14:10 ` [PATCH 37/45] perf stat report: Allow to override aggr_mode Jiri Olsa
2015-09-30 14:10 ` [PATCH 38/45] perf script: Check output fields only for samples Jiri Olsa
2015-09-30 14:10 ` [PATCH 39/45] perf script: Process cpu/threads maps Jiri Olsa
2015-09-30 14:10 ` [PATCH 40/45] perf script: Process stat config event Jiri Olsa
2015-09-30 14:10 ` [PATCH 41/45] perf script: Add process_stat/process_stat_interval scripting interface Jiri Olsa
2015-09-30 14:10 ` [PATCH 42/45] perf script: Add stat default handlers Jiri Olsa
2015-09-30 14:10 ` [PATCH 43/45] perf script: Display stat events by default Jiri Olsa
2015-09-30 14:10 ` [PATCH 44/45] perf script: Add python support for stat events Jiri Olsa
2015-09-30 14:10 ` [PATCH 45/45] perf script: Add stat-cpi.py script Jiri Olsa
2015-09-30 21:09 ` [PATCHv2 00/45] perf stat: Add scripting support Liang, Kan
2015-09-30 21:34 ` Jiri Olsa
2015-09-30 21:36 ` 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=1443622258-17158-30-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=kan.liang@intel.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
Powered by JetHome