Messages in this thread Patch in this message | | | From | Kyle Meyer <> | Subject | [PATCH v3 2/6] perf/util/svghelper: Replace MAX_NR_CPUS with env->nr_cpus_online | Date | Mon, 19 Aug 2019 15:23:15 -0500 |
| |
env->nr_cpus_online, the number of CPUs online during a record session, can be used as a dynamic alternative for MAX_NR_CPUS in svg_build_topology_map. The value of env->nr_cpus_online can be passed into str_to_bitmap, scan_core_topology, and svg_build_topology_map to replace MAX_NR_CPUS as well.
Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: linux-kernel@vger.kernel.org Cc: Russ Anderson <russ.anderson@hpe.com> Signed-off-by: Kyle Meyer <kyle.meyer@hpe.com> --- tools/perf/util/svghelper.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/tools/perf/util/svghelper.c b/tools/perf/util/svghelper.c index efe642b6c99d..c9df3512ee6f 100644 --- a/tools/perf/util/svghelper.c +++ b/tools/perf/util/svghelper.c @@ -695,7 +695,8 @@ struct topology { int sib_thr_nr; }; -static void scan_thread_topology(int *map, struct topology *t, int cpu, int *pos) +static void scan_thread_topology(int *map, struct topology *t, int cpu, + int *pos, int max_cpus) { int i; int thr; @@ -704,28 +705,24 @@ static void scan_thread_topology(int *map, struct topology *t, int cpu, int *pos if (!test_bit(cpu, cpumask_bits(&t->sib_thr[i]))) continue; - for_each_set_bit(thr, - cpumask_bits(&t->sib_thr[i]), - MAX_NR_CPUS) + for_each_set_bit(thr, cpumask_bits(&t->sib_thr[i]), max_cpus) if (map[thr] == -1) map[thr] = (*pos)++; } } -static void scan_core_topology(int *map, struct topology *t) +static void scan_core_topology(int *map, struct topology *t, int max_cpus) { int pos = 0; int i; int cpu; for (i = 0; i < t->sib_core_nr; i++) - for_each_set_bit(cpu, - cpumask_bits(&t->sib_core[i]), - MAX_NR_CPUS) - scan_thread_topology(map, t, cpu, &pos); + for_each_set_bit(cpu, cpumask_bits(&t->sib_core[i]), max_cpus) + scan_thread_topology(map, t, cpu, &pos, max_cpus); } -static int str_to_bitmap(char *s, cpumask_t *b) +static int str_to_bitmap(char *s, cpumask_t *b, int max_cpus) { int i; int ret = 0; @@ -738,7 +735,7 @@ static int str_to_bitmap(char *s, cpumask_t *b) for (i = 0; i < m->nr; i++) { c = m->map[i]; - if (c >= MAX_NR_CPUS) { + if (c >= max_cpus) { ret = -1; break; } @@ -771,7 +768,7 @@ int svg_build_topology_map(struct perf_env *env) } for (i = 0; i < env->nr_sibling_cores; i++) { - if (str_to_bitmap(sib_core, &t.sib_core[i])) { + if (str_to_bitmap(sib_core, &t.sib_core[i], env->nr_cpus_online)) { fprintf(stderr, "topology: can't parse siblings map\n"); goto exit; } @@ -780,7 +777,7 @@ int svg_build_topology_map(struct perf_env *env) } for (i = 0; i < env->nr_sibling_threads; i++) { - if (str_to_bitmap(sib_thr, &t.sib_thr[i])) { + if (str_to_bitmap(sib_thr, &t.sib_thr[i], env->nr_cpus_online)) { fprintf(stderr, "topology: can't parse siblings map\n"); goto exit; } @@ -788,16 +785,16 @@ int svg_build_topology_map(struct perf_env *env) sib_thr += strlen(sib_thr) + 1; } - topology_map = malloc(sizeof(int) * MAX_NR_CPUS); + topology_map = malloc(sizeof(int) * env->nr_cpus_online); if (!topology_map) { fprintf(stderr, "topology: no memory\n"); goto exit; } - for (i = 0; i < MAX_NR_CPUS; i++) + for (i = 0; i < env->nr_cpus_online; i++) topology_map[i] = -1; - scan_core_topology(topology_map, &t); + scan_core_topology(topology_map, &t, env->nr_cpus_online); return 0; -- 2.12.3
| |