Commit c808624e authored by Patryk Wlazlyn's avatar Patryk Wlazlyn Committed by Len Brown
Browse files

tools/power turbostat: Honor --show CPU, even when even when num_cpus=1 



Honor --show CPU and --show Core when "topo.num_cpus == 1".
Previously turbostat assumed that on a 1-CPU system, these
columns should never appear.

Honoring these flags makes it easier for several programs
that parse turbostat output.

Signed-off-by: default avatarPatryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent fed8511c

tools/power/x86/turbostat/turbostat.c

+2 −2
Original line number Diff line number Diff line
@@ -8229,7 +8229,7 @@ void topology_probe(bool startup) 
	set_max_cpu_num();

	topo.num_cpus = 0;

	for_all_proc_cpus(count_cpus);

	if (!summary_only && topo.num_cpus > 1)

	if (!summary_only)

		BIC_PRESENT(BIC_CPU);



	if (debug > 1)
@@ -8367,7 +8367,7 @@ void topology_probe(bool startup) 
	topo.cores_per_node = max_core_id + 1;

	if (debug > 1)

		fprintf(outf, "max_core_id %d, sizing for %d cores per package\n", max_core_id, topo.cores_per_node);

	if (!summary_only && topo.cores_per_node > 1)

	if (!summary_only)

		BIC_PRESENT(BIC_Core);



	topo.num_die = topo.max_die_id + 1;