lkml.org 
[lkml]   [2021]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 17/22] perf cpumap: Refactor cpu_map__build_map
On Tue, Dec 07, 2021 at 06:46:02PM -0800, Ian Rogers wrote:

SNIP

> - perror("cannot build core map");
> - return -1;
> - }
> - stat_config.aggr_get_id = perf_stat__get_core_file;
> - break;
> + return perf_stat__get_core_file;
> case AGGR_NODE:
> - if (perf_env__build_node_map(env, evsel_list->core.cpus, &stat_config.aggr_map)) {
> - perror("cannot build core map");
> - return -1;
> - }
> - stat_config.aggr_get_id = perf_stat__get_node_file;
> - break;
> + return perf_stat__get_node_file;
> case AGGR_NONE:
> case AGGR_GLOBAL:
> case AGGR_THREAD:
> case AGGR_UNSET:
> default:
> - break;
> + return NULL;
> }
> +}
> +
> +static int perf_stat_init_aggr_mode_file(struct perf_stat *st)
> +{
> + struct perf_env *env = &st->session->header.env;
>
> + aggr_cpu_id_get_t f = aggr_mode__get_aggr_file(stat_config.aggr_mode);

we use get_id for aggr_get_id_t, maybe we could use it instead of 'f' in
here as well

> +
> + if (!f)
> + return 0;
> +
> + stat_config.aggr_map = cpu_aggr_map__new(evsel_list->core.cpus, f, env);
> + if (!stat_config.aggr_map) {
> + pr_err("cannot build %s map", aggr_mode__string[stat_config.aggr_mode]);
> + return -1;
> + }
> + stat_config.aggr_get_id = aggr_mode__get_id_file(stat_config.aggr_mode);
> return 0;
> }
>
> diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
> index 32f9fc2dd389..ba4468f691c8 100644
> --- a/tools/perf/util/cpumap.c
> +++ b/tools/perf/util/cpumap.c
> @@ -140,7 +140,7 @@ struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_u
> return id;
> }
>
> -static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer)
> +static int aggr_cpu_id__cmp(const void *a_pointer, const void *b_pointer)
> {
> struct aggr_cpu_id *a = (struct aggr_cpu_id *)a_pointer;
> struct aggr_cpu_id *b = (struct aggr_cpu_id *)b_pointer;
> @@ -157,37 +157,40 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer)
> return a->thread - b->thread;
> }
>
> -int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
> - struct aggr_cpu_id (*f)(int cpu, void *data),
> - void *data)
> +struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus,
> + aggr_cpu_id_get_t f,
> + void *data)

same here

thanks,
jirka

> {
> - int nr = cpus->nr;
> - struct cpu_aggr_map *c = cpu_aggr_map__empty_new(nr);
> - int cpu, s2;
> - struct aggr_cpu_id s1;
> + int cpu, idx;
> + struct cpu_aggr_map *c = cpu_aggr_map__empty_new(cpus->nr);
>
> if (!c)
> - return -1;
> + return NULL;
>
> /* Reset size as it may only be partially filled */
> c->nr = 0;
>
> - for (cpu = 0; cpu < nr; cpu++) {
> - s1 = f(cpu, data);
> - for (s2 = 0; s2 < c->nr; s2++) {
> - if (aggr_cpu_id__equal(&s1, &c->map[s2]))
> + perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
> + bool duplicate = false;
> + struct aggr_cpu_id cpu_id = f(cpu, data);
> +
> + for (int j = 0; j < c->nr; j++) {
> + if (aggr_cpu_id__equal(&cpu_id, &c->map[j])) {
> + duplicate = true;
> break;
> + }
> }
> - if (s2 == c->nr) {
> - c->map[c->nr] = s1;
> + if (!duplicate) {
> + c->map[c->nr] = cpu_id;
> c->nr++;
> }
> }
> +
> /* ensure we process id in increasing order */
> - qsort(c->map, c->nr, sizeof(struct aggr_cpu_id), cmp_aggr_cpu_id);
> + qsort(c->map, c->nr, sizeof(struct aggr_cpu_id), aggr_cpu_id__cmp);
> +
> + return c;
>
> - *res = c;
> - return 0;
> }
>

SNIP

\
 
 \ /
  Last update: 2021-12-11 20:25    [W:0.171 / U:0.580 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site