diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 319fb0a0d05ea8408a8f46f64cf3b33b6c3c64bf..59f38c7693f8648b7ce494edc864f09a0f6b09d5 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -106,11 +106,24 @@ static int perf_env__read_arch(struct perf_env *env) return env->arch ? 0 : -ENOMEM; } +static int perf_env__read_nr_cpus_avail(struct perf_env *env) +{ + if (env->nr_cpus_avail == 0) + env->nr_cpus_avail = cpu__max_present_cpu(); + + return env->nr_cpus_avail ? 0 : -ENOENT; +} + const char *perf_env__raw_arch(struct perf_env *env) { return env && !perf_env__read_arch(env) ? env->arch : "unknown"; } +int perf_env__nr_cpus_avail(struct perf_env *env) +{ + return env && !perf_env__read_nr_cpus_avail(env) ? env->nr_cpus_avail : 0; +} + void cpu_cache_level__free(struct cpu_cache_level *cache) { free(cache->type); diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index 62e193948608502c886594d5ab5b50145bda42fa..1f3ccc36853030bc8ea58d35ea19bba8e225f732 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -77,5 +77,6 @@ void cpu_cache_level__free(struct cpu_cache_level *cache); const char *perf_env__arch(struct perf_env *env); const char *perf_env__raw_arch(struct perf_env *env); +int perf_env__nr_cpus_avail(struct perf_env *env); #endif /* __PERF_ENV_H */ diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index e011a7160380a437016f15bbe482383c81dc4974..f62ecd9c36e89875dd92d7650db9aa96cb6415e7 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -2305,6 +2305,11 @@ bool machine__is(struct machine *machine, const char *arch) return machine && !strcmp(perf_env__raw_arch(machine->env), arch); } +int machine__nr_cpus_avail(struct machine *machine) +{ + return machine ? perf_env__nr_cpus_avail(machine->env) : 0; +} + int machine__get_kernel_start(struct machine *machine) { struct map *map = machine__kernel_map(machine); diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h index b31d33b5aa2aa4e2cdddfd053c455b969fe36b23..2d2b092ba753c4fc83381af0728c0310737860fc 100644 --- a/tools/perf/util/machine.h +++ b/tools/perf/util/machine.h @@ -189,6 +189,7 @@ static inline bool machine__is_host(struct machine *machine) } bool machine__is(struct machine *machine, const char *arch); +int machine__nr_cpus_avail(struct machine *machine); struct thread *__machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid); struct thread *machine__findnew_thread(struct machine *machine, pid_t pid, pid_t tid);