Commit cda20338 authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: Remember global max_die_id 



This is necessary to gracefully handle sparse die_id's.

no functional change

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ae3326ac

tools/power/x86/turbostat/turbostat.c

+5 −5
Original line number Diff line number Diff line
@@ -1415,6 +1415,7 @@ struct topo_params { 
	int allowed_cpus;

	int allowed_cores;

	int max_cpu_num;

	int max_die_id;

	int max_node_num;

	int nodes_per_pkg;

	int cores_per_node;
@@ -6980,7 +6981,6 @@ void topology_probe(bool startup) 
	int i;

	int max_core_id = 0;

	int max_package_id = 0;

	int max_die_id = 0;

	int max_siblings = 0;



	/* Initialize num_cpus, max_cpu_num */
@@ -7097,8 +7097,8 @@ void topology_probe(bool startup) 


		/* get die information */

		cpus[i].die_id = get_die_id(i);

		if (cpus[i].die_id > max_die_id)

			max_die_id = cpus[i].die_id;

		if (cpus[i].die_id > topo.max_die_id)

			topo.max_die_id = cpus[i].die_id;



		/* get numa node information */

		cpus[i].physical_node_id = get_physical_node_id(&cpus[i]);
@@ -7124,9 +7124,9 @@ void topology_probe(bool startup) 
	if (!summary_only && topo.cores_per_node > 1)

		BIC_PRESENT(BIC_Core);



	topo.num_die = max_die_id + 1;

	topo.num_die = topo.max_die_id + 1;

	if (debug > 1)

		fprintf(outf, "max_die_id %d, sizing for %d die\n", max_die_id, topo.num_die);

		fprintf(outf, "max_die_id %d, sizing for %d die\n", topo.max_die_id, topo.num_die);

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

		BIC_PRESENT(BIC_Die);