Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

tools/power turbostat: fit output into 80 columns on snb-ep 



Reduce columns for package number to 1.
If you can afford more than 9 packages,
you can also afford a terminal with more than 80 columns:-)

Also shave a column also off the package C-states

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

tools/power/x86/turbostat/turbostat.c

+23 −23
Original line number Diff line number Diff line
@@ -128,9 +128,9 @@ unsigned long long get_msr(int cpu, off_t offset) 
void print_header(void)

{

	if (show_pkg)

		fprintf(stderr, "pkg ");

		fprintf(stderr, "pk");

	if (show_core)

		fprintf(stderr, "core");

		fprintf(stderr, " cr");

	if (show_cpu)

		fprintf(stderr, " CPU");

	if (do_nhm_cstates)
@@ -201,7 +201,7 @@ void print_cnt(struct counters *p) 
			fprintf(stderr, "    ");

	} else {

		if (show_pkg)

			fprintf(stderr, "%4d", p->pkg);

			fprintf(stderr, "%d", p->pkg);

		if (show_core)

			fprintf(stderr, "%4d", p->core);

		if (show_cpu)
@@ -244,19 +244,19 @@ void print_cnt(struct counters *p) 
			fprintf(stderr, "  ****");

	}

	if (do_nhm_cstates)

		fprintf(stderr, "%7.2f", 100.0 * p->c3/p->tsc);

		fprintf(stderr, " %6.2f", 100.0 * p->c3/p->tsc);

	if (do_nhm_cstates)

		fprintf(stderr, "%7.2f", 100.0 * p->c6/p->tsc);

		fprintf(stderr, " %6.2f", 100.0 * p->c6/p->tsc);

	if (do_snb_cstates)

		fprintf(stderr, "%7.2f", 100.0 * p->c7/p->tsc);

		fprintf(stderr, " %6.2f", 100.0 * p->c7/p->tsc);

	if (do_snb_cstates)

		fprintf(stderr, "%7.2f", 100.0 * p->pc2/p->tsc);

		fprintf(stderr, " %5.2f", 100.0 * p->pc2/p->tsc);

	if (do_nhm_cstates)

		fprintf(stderr, "%7.2f", 100.0 * p->pc3/p->tsc);

		fprintf(stderr, " %5.2f", 100.0 * p->pc3/p->tsc);

	if (do_nhm_cstates)

		fprintf(stderr, "%7.2f", 100.0 * p->pc6/p->tsc);

		fprintf(stderr, " %5.2f", 100.0 * p->pc6/p->tsc);

	if (do_snb_cstates)

		fprintf(stderr, "%7.2f", 100.0 * p->pc7/p->tsc);

		fprintf(stderr, " %5.2f", 100.0 * p->pc7/p->tsc);

	if (extra_msr_offset)

		fprintf(stderr, "  0x%016llx", p->extra_msr);

	putc('\n', stderr);