Commit fee86541 authored Jan 21, 2017 by Len Brown

tools/power turbostat: show all columns, independent of --debug



Some time ago, turbostat overflowed 80 columns.

So on the assumption that a "casual" user would always
want topology and frequency columns, we hid the rest
of the columns and the system configuration decoding
behind the --debug option.

Not everybody liked that change -- including me.
I use --debug 99% of the time...

Well, now we have "-o file" to put turbostat output into a file,
so unless you are watching real-time in a small window,
column count is less frequently a factor.

And more recently, we got the "--hide columnA,columnB" option
to specify columns to skip.

So now we "un-hide" the rest of the columns from behind --debug,
and show them all, by default.

Signed-off-by: Len Brown <len.brown@intel.com>

parent 33148d67

tools/power/x86/turbostat/turbostat.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -479,9 +479,6 @@ void print_header(void)
		if (DO_BIC(BIC_TSC_MHz))
		outp += sprintf(outp, "\tTSC_MHz");

		if (!debug)
		goto done;

		if (DO_BIC(BIC_IRQ))
		outp += sprintf(outp, "\tIRQ");
		if (DO_BIC(BIC_SMI))
		@@ -593,7 +590,6 @@ void print_header(void)
		}
		}

		done:
		outp += sprintf(outp, "\n");
		}

		@@ -741,9 +737,6 @@ int format_counters(struct thread_data t, struct core_data c,
		if (DO_BIC(BIC_TSC_MHz))
		outp += sprintf(outp, "\t%.0f", 1.0 * t->tsc/units/interval_float);

		if (!debug)
		goto done;

		/* IRQ */
		if (DO_BIC(BIC_IRQ))
		outp += sprintf(outp, "\t%d", t->irq_count);