tools/power turbostat: set max_num_cpus equal to the cpumask length
authorPrarit Bhargava <prarit@redhat.com>
Fri, 1 Jun 2018 14:04:28 +0000 (10:04 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 2 Jun 2018 03:12:46 +0000 (23:12 -0400)
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: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>
tools/power/x86/turbostat/turbostat.c

index 6910773e85a9bcc72ebedd6501519e2b6567d7d8..1684f4ec627eeedbaa7e3be22e1f586d3ed4615c 100644 (file)
@@ -2496,6 +2496,20 @@ void re_initialize(void)
        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()
@@ -2503,10 +2517,7 @@ void re_initialize(void)
  */
 int count_cpus(int cpu)
 {
-       if (topo.max_cpu_num < cpu)
-               topo.max_cpu_num = cpu;
-
-       topo.num_cpus += 1;
+       topo.num_cpus++;
        return 0;
 }
 int mark_cpu_present(int cpu)
@@ -4564,8 +4575,8 @@ void topology_probe()
        } *cpus;
 
        /* Initialize num_cpus, max_cpu_num */
+       set_max_cpu_num();
        topo.num_cpus = 0;
-       topo.max_cpu_num = 0;
        for_all_proc_cpus(count_cpus);
        if (!summary_only && topo.num_cpus > 1)
                BIC_PRESENT(BIC_CPU);