From: Len Brown <lenb@kernel.org>
To: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Len Brown <len.brown@intel.com>
Subject: [PATCH 34/44] tools/power turbostat: Add --list option to show available header names
Date: Wed, 1 Mar 2017 00:27:38 -0500 [thread overview]
Message-ID: <c8ade3616a1a5cf7767c0338d2b02007796f5d88.1488345270.git.len.brown@intel.com> (raw)
In-Reply-To: <20170301052748.27810-1-lenb@kernel.org>
In-Reply-To: <678a3bd1b3de6d2ebf604e7d708bc8150bb667e9.1488345270.git.len.brown@intel.com>
From: Len Brown <len.brown@intel.com>
It is handy to know the list of column header names,
so that they can be used with --add and --skip
The new --list option shows them:
sudo ./turbostat --list --hide sysfs
,Core,CPU,Avg_MHz,Busy%,Bzy_MHz,TSC_MHz,IRQ,SMI,CPU%c1,CPU%c3,CPU%c6,CPU%c7,CoreTmp,PkgTmp,GFX%rc6,GFXMHz,PkgWatt,CorWatt,GFXWatt
Signed-off-by: Len Brown <len.brown@intel.com>
---
tools/power/x86/turbostat/turbostat.c | 118 +++++++++++++++++++---------------
1 file changed, 66 insertions(+), 52 deletions(-)
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 48b540a2fe81..7b02fbb65893 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -52,6 +52,7 @@ unsigned int debug;
unsigned int quiet;
unsigned int rapl_joules;
unsigned int summary_only;
+unsigned int list_header_only;
unsigned int dump_only;
unsigned int do_snb_cstates;
unsigned int do_knl_cstates;
@@ -469,133 +470,133 @@ unsigned long long bic_lookup(char *name_list)
return retval;
}
-void print_header(void)
+void print_header(char *delim)
{
struct msr_counter *mp;
if (DO_BIC(BIC_Package))
- outp += sprintf(outp, "\tPackage");
+ outp += sprintf(outp, "%sPackage", delim);
if (DO_BIC(BIC_Core))
- outp += sprintf(outp, "\tCore");
+ outp += sprintf(outp, "%sCore", delim);
if (DO_BIC(BIC_CPU))
- outp += sprintf(outp, "\tCPU");
+ outp += sprintf(outp, "%sCPU", delim);
if (DO_BIC(BIC_Avg_MHz))
- outp += sprintf(outp, "\tAvg_MHz");
+ outp += sprintf(outp, "%sAvg_MHz", delim);
if (DO_BIC(BIC_Busy))
- outp += sprintf(outp, "\tBusy%%");
+ outp += sprintf(outp, "%sBusy%%", delim);
if (DO_BIC(BIC_Bzy_MHz))
- outp += sprintf(outp, "\tBzy_MHz");
+ outp += sprintf(outp, "%sBzy_MHz", delim);
if (DO_BIC(BIC_TSC_MHz))
- outp += sprintf(outp, "\tTSC_MHz");
+ outp += sprintf(outp, "%sTSC_MHz", delim);
if (DO_BIC(BIC_IRQ))
- outp += sprintf(outp, "\tIRQ");
+ outp += sprintf(outp, "%sIRQ", delim);
if (DO_BIC(BIC_SMI))
- outp += sprintf(outp, "\tSMI");
+ outp += sprintf(outp, "%sSMI", delim);
for (mp = sys.tp; mp; mp = mp->next) {
if (mp->format == FORMAT_RAW) {
if (mp->width == 64)
- outp += sprintf(outp, "\t%18.18s", mp->name);
+ outp += sprintf(outp, "%s%18.18s", delim, mp->name);
else
- outp += sprintf(outp, "\t%10.10s", mp->name);
+ outp += sprintf(outp, "%s%10.10s", delim, mp->name);
} else {
- outp += sprintf(outp, "\t%s", mp->name);
+ outp += sprintf(outp, "%s%s", delim, mp->name);
}
}
if (DO_BIC(BIC_CPU_c1))
- outp += sprintf(outp, "\tCPU%%c1");
+ outp += sprintf(outp, "%sCPU%%c1", delim);
if (DO_BIC(BIC_CPU_c3) && !do_slm_cstates && !do_knl_cstates)
- outp += sprintf(outp, "\tCPU%%c3");
+ outp += sprintf(outp, "%sCPU%%c3", delim);
if (DO_BIC(BIC_CPU_c6))
- outp += sprintf(outp, "\tCPU%%c6");
+ outp += sprintf(outp, "%sCPU%%c6", delim);
if (DO_BIC(BIC_CPU_c7))
- outp += sprintf(outp, "\tCPU%%c7");
+ outp += sprintf(outp, "%sCPU%%c7", delim);
if (DO_BIC(BIC_Mod_c6))
- outp += sprintf(outp, "\tMod%%c6");
+ outp += sprintf(outp, "%sMod%%c6", delim);
if (DO_BIC(BIC_CoreTmp))
- outp += sprintf(outp, "\tCoreTmp");
+ outp += sprintf(outp, "%sCoreTmp", delim);
for (mp = sys.cp; mp; mp = mp->next) {
if (mp->format == FORMAT_RAW) {
if (mp->width == 64)
- outp += sprintf(outp, "\t%18.18s", mp->name);
+ outp += sprintf(outp, "%s%18.18s", delim, mp->name);
else
- outp += sprintf(outp, "\t%10.10s", mp->name);
+ outp += sprintf(outp, "%s%10.10s", delim, mp->name);
} else {
- outp += sprintf(outp, "\t%s", mp->name);
+ outp += sprintf(outp, "%s%s", delim, mp->name);
}
}
if (DO_BIC(BIC_PkgTmp))
- outp += sprintf(outp, "\tPkgTmp");
+ outp += sprintf(outp, "%sPkgTmp", delim);
if (DO_BIC(BIC_GFX_rc6))
- outp += sprintf(outp, "\tGFX%%rc6");
+ outp += sprintf(outp, "%sGFX%%rc6", delim);
if (DO_BIC(BIC_GFXMHz))
- outp += sprintf(outp, "\tGFXMHz");
+ outp += sprintf(outp, "%sGFXMHz", delim);
if (do_skl_residency) {
- outp += sprintf(outp, "\tTotl%%C0");
- outp += sprintf(outp, "\tAny%%C0");
- outp += sprintf(outp, "\tGFX%%C0");
- outp += sprintf(outp, "\tCPUGFX%%");
+ outp += sprintf(outp, "%sTotl%%C0", delim);
+ outp += sprintf(outp, "%sAny%%C0", delim);
+ outp += sprintf(outp, "%sGFX%%C0", delim);
+ outp += sprintf(outp, "%sCPUGFX%%", delim);
}
if (DO_BIC(BIC_Pkgpc2))
- outp += sprintf(outp, "\tPkg%%pc2");
+ outp += sprintf(outp, "%sPkg%%pc2", delim);
if (DO_BIC(BIC_Pkgpc3))
- outp += sprintf(outp, "\tPkg%%pc3");
+ outp += sprintf(outp, "%sPkg%%pc3", delim);
if (DO_BIC(BIC_Pkgpc6))
- outp += sprintf(outp, "\tPkg%%pc6");
+ outp += sprintf(outp, "%sPkg%%pc6", delim);
if (DO_BIC(BIC_Pkgpc7))
- outp += sprintf(outp, "\tPkg%%pc7");
+ outp += sprintf(outp, "%sPkg%%pc7", delim);
if (DO_BIC(BIC_Pkgpc8))
- outp += sprintf(outp, "\tPkg%%pc8");
+ outp += sprintf(outp, "%sPkg%%pc8", delim);
if (DO_BIC(BIC_Pkgpc9))
- outp += sprintf(outp, "\tPkg%%pc9");
+ outp += sprintf(outp, "%sPkg%%pc9", delim);
if (DO_BIC(BIC_Pkgpc10))
- outp += sprintf(outp, "\tPk%%pc10");
+ outp += sprintf(outp, "%sPk%%pc10", delim);
if (do_rapl && !rapl_joules) {
if (DO_BIC(BIC_PkgWatt))
- outp += sprintf(outp, "\tPkgWatt");
+ outp += sprintf(outp, "%sPkgWatt", delim);
if (DO_BIC(BIC_CorWatt))
- outp += sprintf(outp, "\tCorWatt");
+ outp += sprintf(outp, "%sCorWatt", delim);
if (DO_BIC(BIC_GFXWatt))
- outp += sprintf(outp, "\tGFXWatt");
+ outp += sprintf(outp, "%sGFXWatt", delim);
if (DO_BIC(BIC_RAMWatt))
- outp += sprintf(outp, "\tRAMWatt");
+ outp += sprintf(outp, "%sRAMWatt", delim);
if (DO_BIC(BIC_PKG__))
- outp += sprintf(outp, "\tPKG_%%");
+ outp += sprintf(outp, "%sPKG_%%", delim);
if (DO_BIC(BIC_RAM__))
- outp += sprintf(outp, "\tRAM_%%");
+ outp += sprintf(outp, "%sRAM_%%", delim);
} else if (do_rapl && rapl_joules) {
if (DO_BIC(BIC_Pkg_J))
- outp += sprintf(outp, "\tPkg_J");
+ outp += sprintf(outp, "%sPkg_J", delim);
if (DO_BIC(BIC_Cor_J))
- outp += sprintf(outp, "\tCor_J");
+ outp += sprintf(outp, "%sCor_J", delim);
if (DO_BIC(BIC_GFX_J))
- outp += sprintf(outp, "\tGFX_J");
+ outp += sprintf(outp, "%sGFX_J", delim);
if (DO_BIC(BIC_RAM_J))
- outp += sprintf(outp, "\tRAM_J");
+ outp += sprintf(outp, "%sRAM_J", delim);
if (DO_BIC(BIC_PKG__))
- outp += sprintf(outp, "\tPKG_%%");
+ outp += sprintf(outp, "%sPKG_%%", delim);
if (DO_BIC(BIC_RAM__))
- outp += sprintf(outp, "\tRAM_%%");
+ outp += sprintf(outp, "%sRAM_%%", delim);
}
for (mp = sys.pp; mp; mp = mp->next) {
if (mp->format == FORMAT_RAW) {
if (mp->width == 64)
- outp += sprintf(outp, "\t%18.18s", mp->name);
+ outp += sprintf(outp, "%s%18.18s", delim, mp->name);
else
- outp += sprintf(outp, "\t%10.10s", mp->name);
+ outp += sprintf(outp, "%s%10.10s", delim, mp->name);
} else {
- outp += sprintf(outp, "\t%s", mp->name);
+ outp += sprintf(outp, "%s%s", delim, mp->name);
}
}
@@ -933,7 +934,7 @@ void format_all_counters(struct thread_data *t, struct core_data *c, struct pkg_
static int printed;
if (!printed || !summary_only)
- print_header();
+ print_header("\t");
if (topo.num_cpus > 1)
format_counters(&average.threads, &average.cores,
@@ -4107,6 +4108,7 @@ void help()
"--quiet skip decoding system configuration header\n"
"--interval sec Override default 5-second measurement interval\n"
"--help print this help message\n"
+ "--list list column headers only\n"
"--out file create or truncate \"file\" for all output\n"
"--version print version information\n"
"\n"
@@ -4814,6 +4816,7 @@ void cmdline(int argc, char **argv)
{"help", no_argument, 0, 'h'},
{"hide", required_argument, 0, 'H'}, // meh, -h taken by --help
{"Joules", no_argument, 0, 'J'},
+ {"list", no_argument, 0, 'l'},
{"out", required_argument, 0, 'o'},
{"Package", no_argument, 0, 'p'},
{"processor", no_argument, 0, 'p'},
@@ -4866,6 +4869,10 @@ void cmdline(int argc, char **argv)
case 'J':
rapl_joules++;
break;
+ case 'l':
+ list_header_only++;
+ quiet++;
+ break;
case 'o':
outf = fopen_or_die(optarg, "w");
break;
@@ -4912,6 +4919,13 @@ int main(int argc, char **argv)
if (dump_only)
return get_and_dump_counters();
+ /* list header and exit */
+ if (list_header_only) {
+ print_header(",");
+ flush_output_stdout();
+ return 0;
+ }
+
/*
* if any params left, it must be a command to fork
*/
--
2.11.0.161.g6610af872
next prev parent reply other threads:[~2017-03-01 5:40 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-01 5:27 [GIT PULL] turbostat 17.02.24 Len Brown
2017-03-01 5:27 ` [PATCH 01/44] tools/power turbostat: fix bugs in --add option Len Brown
2017-03-01 5:27 ` [PATCH 02/44] tools/power turbostat: Add --show and --hide parameters Len Brown
2017-03-01 5:27 ` [PATCH 03/44] tools/power turbostat: BYT does not have MSR_MISC_PWR_MGMT Len Brown
2017-03-01 5:27 ` [PATCH 04/44] tools/power turbostat: decode Baytrail CC6 and MC6 demotion configuration Len Brown
2017-03-01 5:27 ` [PATCH 05/44] tools/power turbostat: Baytrail: remove debug line in quiet mode Len Brown
2017-03-01 5:27 ` [PATCH 06/44] tools/power turbostat: update MSR_PKG_CST_CONFIG_CONTROL decoding Len Brown
2017-03-01 5:27 ` [PATCH 07/44] x86: msr-index.h: Define MSR_PKG_CST_CONFIG_CONTROL Len Brown
2017-03-01 5:27 ` [PATCH 08/44] intel_idle: use new name for MSR_PKG_CST_CONFIG_CONTROL Len Brown
2017-03-01 5:27 ` [PATCH 09/44] tools/power turbostat: " Len Brown
2017-03-01 5:27 ` [PATCH 10/44] x86: msr-index.h: Remove unused MSR_NHM_SNB_PKG_CST_CFG_CTL Len Brown
2017-03-01 5:27 ` [PATCH 11/44] tools/power turbostat: Baytrail c-state support Len Brown
2017-03-01 5:27 ` [PATCH 12/44] tools/power turbostat: add precision to --debug frequency output Len Brown
2017-03-01 5:27 ` [PATCH 13/44] tools/power turbostat: further decode MSR_IA32_MISC_ENABLE Len Brown
2017-03-01 5:27 ` [PATCH 14/44] x86 msr-index.h: Define Atom specific core ratio MSR locations Len Brown
2017-03-01 5:27 ` [PATCH 15/44] intel_pstate: use MSR_ATOM_RATIOS definitions from msr-index.h Len Brown
2017-03-01 5:27 ` [PATCH 16/44] tools/power turbostat: dump Atom P-states correctly Len Brown
2017-03-01 5:27 ` [PATCH 17/44] tools/power turbostat: decode CPUID(6).TURBO Len Brown
2017-03-01 5:27 ` [PATCH 18/44] x86 msr_index.h: Define MSR_MISC_FEATURE_CONTROL Len Brown
2017-03-01 5:27 ` [PATCH 19/44] tools/power turbostat: decode MSR_MISC_FEATURE_CONTROL Len Brown
2017-03-01 5:27 ` [PATCH 20/44] tools/power turbostat: show all columns, independent of --debug Len Brown
2017-03-01 5:27 ` [PATCH 21/44] tools/power turbostat: print system config, unless --quiet Len Brown
2017-03-01 5:27 ` [PATCH 22/44] tools/power turbostat: use tsc_tweak everwhere it is needed Len Brown
2017-03-01 5:27 ` [PATCH 23/44] tools/power turbostat: bug fixes to --add, --show/--hide features Len Brown
2017-03-01 5:27 ` [PATCH 24/44] x86: intel-family.h: Add GEMINI_LAKE SOC Len Brown
2017-03-01 23:48 ` Andy Shevchenko
2017-03-01 5:27 ` [PATCH 25/44] tools/power turbostat: initial Gemini Lake SOC support Len Brown
2017-03-01 5:27 ` [PATCH 26/44] tools/power turbostat: Denverton: use HW CC1 counter, skip C3, C7 Len Brown
2017-03-01 5:27 ` [PATCH 27/44] tools/power turbostat: skip unused counters on SKX Len Brown
2017-03-01 5:27 ` [PATCH 28/44] tools/power turbostat: fix decoding for GLM, DNV, SKX turbo-ratio limits Len Brown
2017-03-01 5:27 ` [PATCH 29/44] tools/power turbostat: skip unused counters on BDX Len Brown
2017-03-01 5:27 ` [PATCH 30/44] tools/power turbostat: extend --add option to accept /sys path Len Brown
2017-03-01 5:27 ` [PATCH 31/44] tools/power turbostat: print sysfs C-state stats Len Brown
2017-03-01 5:27 ` [PATCH 32/44] tools/power turbostat: add --cpu parameter Len Brown
2017-03-01 5:27 ` [PATCH 33/44] tools/power turbostat: fix zero IRQ count shown in one-shot command mode Len Brown
2017-03-01 5:27 ` Len Brown [this message]
2017-03-01 5:27 ` [PATCH 35/44] tools/power turbostat: use wide columns to display large numbers Len Brown
2017-03-01 5:27 ` [PATCH 36/44] tools/power turbostat: update --list feature Len Brown
2017-03-01 5:27 ` [PATCH 37/44] tools/power turbostat: turbostat.8 update Len Brown
2017-03-01 5:27 ` [PATCH 38/44] tools/power turbostat: move --Package and --processor into the --cpu option Len Brown
2017-03-01 5:27 ` [PATCH 39/44] tools/power turbostat: support "--hide C1" etc Len Brown
2017-03-01 5:27 ` [PATCH 40/44] tools/power turbostat: show package number, even without --debug Len Brown
2017-03-01 5:27 ` [PATCH 41/44] tools/power turbostat: dump p-state software config Len Brown
2017-03-01 5:27 ` [PATCH 42/44] tools/power turbostat: show error on exec Len Brown
2017-03-01 5:27 ` [PATCH 43/44] tools/power turbostat: bugfix: --add u32 was printed as u64 Len Brown
2017-03-01 5:27 ` [PATCH 44/44] tools/power turbostat: version 17.02.24 Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c8ade3616a1a5cf7767c0338d2b02007796f5d88.1488345270.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®