Commit 92664f2e authored by Len Brown's avatar Len Brown
Browse files

tools/power turbostat: Regression fix Uncore MHz printed in hex 



A patch to allow specifying FORMAT_AVERAGE to added counters...
broke the internally added counter for Cluster Uncore MHz -- printing it in HEX.

Fixes: dcd1c379 ("tools/power turbostat: add format "average" for external attributes")
Reported-by: default avatarAndrej Tkalcec <andrej.tkalcec@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3a866087

tools/power/x86/turbostat/turbostat.c

+6 −6
Original line number Diff line number Diff line
@@ -3285,13 +3285,13 @@ int format_counters(PER_THREAD_PARAMS) 


	/* Added counters */

	for (i = 0, mp = sys.tp; mp; i++, mp = mp->next) {

		if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE) {

		if (mp->format == FORMAT_RAW) {

			if (mp->width == 32)

				outp +=

				    sprintf(outp, "%s0x%08x", (printed++ ? delim : ""), (unsigned int)t->counter[i]);

			else

				outp += sprintf(outp, "%s0x%016llx", (printed++ ? delim : ""), t->counter[i]);

		} else if (mp->format == FORMAT_DELTA) {

		} else if (mp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE) {

			if ((mp->type == COUNTER_ITEMS) && sums_need_wide_columns)

				outp += sprintf(outp, "%s%8lld", (printed++ ? delim : ""), t->counter[i]);

			else
@@ -3382,13 +3382,13 @@ int format_counters(PER_THREAD_PARAMS) 
		outp += sprintf(outp, "%s%lld", (printed++ ? delim : ""), c->core_throt_cnt);



	for (i = 0, mp = sys.cp; mp; i++, mp = mp->next) {

		if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE) {

		if (mp->format == FORMAT_RAW) {

			if (mp->width == 32)

				outp +=

				    sprintf(outp, "%s0x%08x", (printed++ ? delim : ""), (unsigned int)c->counter[i]);

			else

				outp += sprintf(outp, "%s0x%016llx", (printed++ ? delim : ""), c->counter[i]);

		} else if (mp->format == FORMAT_DELTA) {

		} else if (mp->format == FORMAT_DELTA || mp->format == FORMAT_AVERAGE) {

			if ((mp->type == COUNTER_ITEMS) && sums_need_wide_columns)

				outp += sprintf(outp, "%s%8lld", (printed++ ? delim : ""), c->counter[i]);

			else
@@ -3581,7 +3581,7 @@ int format_counters(PER_THREAD_PARAMS) 
		outp += sprintf(outp, "%s%d", (printed++ ? delim : ""), p->uncore_mhz);



	for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) {

		if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE) {

		if (mp->format == FORMAT_RAW) {

			if (mp->width == 32)

				outp +=

				    sprintf(outp, "%s0x%08x", (printed++ ? delim : ""), (unsigned int)p->counter[i]);
@@ -3758,7 +3758,7 @@ int delta_package(struct pkg_data *new, struct pkg_data *old) 
	    new->rapl_dram_perf_status.raw_value - old->rapl_dram_perf_status.raw_value;



	for (i = 0, mp = sys.pp; mp; i++, mp = mp->next) {

		if (mp->format == FORMAT_RAW || mp->format == FORMAT_AVERAGE)

		if (mp->format == FORMAT_RAW)

			old->counter[i] = new->counter[i];

		else if (mp->format == FORMAT_AVERAGE)

			old->counter[i] = new->counter[i];