Commit 843c5791 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Len Brown

tools/power turbostat: set max_num_cpus equal to the cpumask length

Future fixes will use sysfs files that contain cpumask output.  The code
needs to know the length of the cpumask in order to determine which cpus
are set in a cpumask.  Currently topo.max_cpu_num is the maximum cpu
number.  It can be increased the the maximum value of cpus represented in
cpumasks.

Set max_num_cpus to the length of a cpumask.
Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 023fe0ac
...@@ -2496,6 +2496,20 @@ void re_initialize(void) ...@@ -2496,6 +2496,20 @@ void re_initialize(void)
printf("turbostat: re-initialized with num_cpus %d\n", topo.num_cpus); printf("turbostat: re-initialized with num_cpus %d\n", topo.num_cpus);
} }
void set_max_cpu_num(void)
{
FILE *filep;
unsigned long dummy;
topo.max_cpu_num = 0;
filep = fopen_or_die(
"/sys/devices/system/cpu/cpu0/topology/thread_siblings",
"r");
while (fscanf(filep, "%lx,", &dummy) == 1)
topo.max_cpu_num += 32;
fclose(filep);
topo.max_cpu_num--; /* 0 based */
}
/* /*
* count_cpus() * count_cpus()
...@@ -2503,10 +2517,7 @@ void re_initialize(void) ...@@ -2503,10 +2517,7 @@ void re_initialize(void)
*/ */
int count_cpus(int cpu) int count_cpus(int cpu)
{ {
if (topo.max_cpu_num < cpu) topo.num_cpus++;
topo.max_cpu_num = cpu;
topo.num_cpus += 1;
return 0; return 0;
} }
int mark_cpu_present(int cpu) int mark_cpu_present(int cpu)
...@@ -4564,8 +4575,8 @@ void topology_probe() ...@@ -4564,8 +4575,8 @@ void topology_probe()
} *cpus; } *cpus;
/* Initialize num_cpus, max_cpu_num */ /* Initialize num_cpus, max_cpu_num */
set_max_cpu_num();
topo.num_cpus = 0; topo.num_cpus = 0;
topo.max_cpu_num = 0;
for_all_proc_cpus(count_cpus); for_all_proc_cpus(count_cpus);
if (!summary_only && topo.num_cpus > 1) if (!summary_only && topo.num_cpus > 1)
BIC_PRESENT(BIC_CPU); BIC_PRESENT(BIC_CPU);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment