Skip to content

Commit e7c95ff

Browse files
lenblenb
committed
tools/power turbostat: tweak whitespace in output format
turbostat -S output was off by 1 space before this patch. Signed-off-by: Len Brown <len.brown@intel.com>
1 parent a138b56 commit e7c95ff

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎tools/power/x86/turbostat/turbostat.c‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -267,90 +267,90 @@ int get_msr(int cpu, off_t offset, unsigned long long *msr)
267267
/*
268268
* Example Format w/ field column widths:
269269
*
270-
* Package Core CPU Avg_MHz Bzy_MHz TSC_MHz SMI %Busy CPU_%c1 CPU_%c3 CPU_%c6 CPU_%c7 CoreTmp PkgTmp Pkg%pc2 Pkg%pc3 Pkg%pc6 Pkg%pc7 PkgWatt CorWatt GFXWatt
271-
* 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567 1234567
270+
* Package Core CPU Avg_MHz Bzy_MHz TSC_MHz SMI %Busy CPU_%c1 CPU_%c3 CPU_%c6 CPU_%c7 CoreTmp PkgTmp Pkg%pc2 Pkg%pc3 Pkg%pc6 Pkg%pc7 PkgWatt CorWatt GFXWatt
271+
* 123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678123456781234567812345678
272272
*/
273273

274274
void print_header(void)
275275
{
276276
if (show_pkg)
277-
outp += sprintf(outp, "Package ");
277+
outp += sprintf(outp, " Package");
278278
if (show_core)
279-
outp += sprintf(outp, " Core ");
279+
outp += sprintf(outp, " Core");
280280
if (show_cpu)
281-
outp += sprintf(outp, " CPU ");
281+
outp += sprintf(outp, " CPU");
282282
if (has_aperf)
283-
outp += sprintf(outp, "Avg_MHz ");
283+
outp += sprintf(outp, " Avg_MHz");
284284
if (do_nhm_cstates)
285-
outp += sprintf(outp, " %%Busy ");
285+
outp += sprintf(outp, " %%Busy");
286286
if (has_aperf)
287-
outp += sprintf(outp, "Bzy_MHz ");
288-
outp += sprintf(outp, "TSC_MHz ");
287+
outp += sprintf(outp, " Bzy_MHz");
288+
outp += sprintf(outp, " TSC_MHz");
289289
if (do_smi)
290-
outp += sprintf(outp, " SMI ");
290+
outp += sprintf(outp, " SMI");
291291
if (extra_delta_offset32)
292-
outp += sprintf(outp, " count 0x%03X ", extra_delta_offset32);
292+
outp += sprintf(outp, " count 0x%03X", extra_delta_offset32);
293293
if (extra_delta_offset64)
294-
outp += sprintf(outp, " COUNT 0x%03X ", extra_delta_offset64);
294+
outp += sprintf(outp, " COUNT 0x%03X", extra_delta_offset64);
295295
if (extra_msr_offset32)
296-
outp += sprintf(outp, " MSR 0x%03X ", extra_msr_offset32);
296+
outp += sprintf(outp, " MSR 0x%03X", extra_msr_offset32);
297297
if (extra_msr_offset64)
298-
outp += sprintf(outp, " MSR 0x%03X ", extra_msr_offset64);
298+
outp += sprintf(outp, " MSR 0x%03X", extra_msr_offset64);
299299
if (do_nhm_cstates)
300-
outp += sprintf(outp, " CPU%%c1 ");
300+
outp += sprintf(outp, " CPU%%c1");
301301
if (do_nhm_cstates && !do_slm_cstates)
302-
outp += sprintf(outp, " CPU%%c3 ");
302+
outp += sprintf(outp, " CPU%%c3");
303303
if (do_nhm_cstates)
304-
outp += sprintf(outp, " CPU%%c6 ");
304+
outp += sprintf(outp, " CPU%%c6");
305305
if (do_snb_cstates)
306-
outp += sprintf(outp, " CPU%%c7 ");
306+
outp += sprintf(outp, " CPU%%c7");
307307

308308
if (do_dts)
309-
outp += sprintf(outp, "CoreTmp ");
309+
outp += sprintf(outp, " CoreTmp");
310310
if (do_ptm)
311-
outp += sprintf(outp, " PkgTmp ");
311+
outp += sprintf(outp, " PkgTmp");
312312

313313
if (do_snb_cstates)
314-
outp += sprintf(outp, "Pkg%%pc2 ");
314+
outp += sprintf(outp, " Pkg%%pc2");
315315
if (do_nhm_cstates && !do_slm_cstates)
316-
outp += sprintf(outp, "Pkg%%pc3 ");
316+
outp += sprintf(outp, " Pkg%%pc3");
317317
if (do_nhm_cstates && !do_slm_cstates)
318-
outp += sprintf(outp, "Pkg%%pc6 ");
318+
outp += sprintf(outp, " Pkg%%pc6");
319319
if (do_snb_cstates)
320-
outp += sprintf(outp, "Pkg%%pc7 ");
320+
outp += sprintf(outp, " Pkg%%pc7");
321321
if (do_c8_c9_c10) {
322-
outp += sprintf(outp, "Pkg%%pc8 ");
323-
outp += sprintf(outp, "Pkg%%pc9 ");
324-
outp += sprintf(outp, "Pk%%pc10 ");
322+
outp += sprintf(outp, " Pkg%%pc8");
323+
outp += sprintf(outp, " Pkg%%pc9");
324+
outp += sprintf(outp, " Pk%%pc10");
325325
}
326326

327327
if (do_rapl && !rapl_joules) {
328328
if (do_rapl & RAPL_PKG)
329-
outp += sprintf(outp, "PkgWatt ");
329+
outp += sprintf(outp, " PkgWatt");
330330
if (do_rapl & RAPL_CORES)
331-
outp += sprintf(outp, "CorWatt ");
331+
outp += sprintf(outp, " CorWatt");
332332
if (do_rapl & RAPL_GFX)
333-
outp += sprintf(outp, "GFXWatt ");
333+
outp += sprintf(outp, " GFXWatt");
334334
if (do_rapl & RAPL_DRAM)
335-
outp += sprintf(outp, "RAMWatt ");
335+
outp += sprintf(outp, " RAMWatt");
336336
if (do_rapl & RAPL_PKG_PERF_STATUS)
337-
outp += sprintf(outp, " PKG_%% ");
337+
outp += sprintf(outp, " PKG_%%");
338338
if (do_rapl & RAPL_DRAM_PERF_STATUS)
339-
outp += sprintf(outp, " RAM_%% ");
339+
outp += sprintf(outp, " RAM_%%");
340340
} else {
341341
if (do_rapl & RAPL_PKG)
342-
outp += sprintf(outp, " Pkg_J ");
342+
outp += sprintf(outp, " Pkg_J");
343343
if (do_rapl & RAPL_CORES)
344-
outp += sprintf(outp, " Cor_J ");
344+
outp += sprintf(outp, " Cor_J");
345345
if (do_rapl & RAPL_GFX)
346-
outp += sprintf(outp, " GFX_J ");
346+
outp += sprintf(outp, " GFX_J");
347347
if (do_rapl & RAPL_DRAM)
348-
outp += sprintf(outp, " RAM_W ");
348+
outp += sprintf(outp, " RAM_W");
349349
if (do_rapl & RAPL_PKG_PERF_STATUS)
350-
outp += sprintf(outp, " PKG_%% ");
350+
outp += sprintf(outp, " PKG_%%");
351351
if (do_rapl & RAPL_DRAM_PERF_STATUS)
352-
outp += sprintf(outp, " RAM_%% ");
353-
outp += sprintf(outp, " time ");
352+
outp += sprintf(outp, " RAM_%%");
353+
outp += sprintf(outp, " time");
354354

355355
}
356356
outp += sprintf(outp, "\n");

0 commit comments

Comments
 (0)