2018-04-10 14:51:47

by Chen Yu

Subject: [PATCH][v2] tools/power turbostat: if --max_loop, print for specific time of loops

From: Chen Yu <[email protected]>

There's a use case during test to only print specific round of loops
if --iterations is specified, for example, with this patch applied:

turbostat -i 5 -t 4
will capture 4 samples with 5 seconds interval.

Signed-off-by: Chen Yu <[email protected]>
---
tools/power/x86/turbostat/turbostat.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index bd9c6b31a504..7a09291765af 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -48,6 +48,7 @@ char *proc_stat = "/proc/stat";
FILE *outf;
int *fd_percpu;
struct timespec interval_ts = {5, 0};
+int iterations;
unsigned int debug;
unsigned int quiet;
unsigned int sums_need_wide_columns;
@@ -470,6 +471,7 @@ void help(void)
" {core | package | j,k,l..m,n-p }\n"
"--quiet skip decoding system configuration header\n"
"--interval sec Override default 5-second measurement interval\n"
+ "--iterations loops The number of loops if interval is specified\n"
"--help print this help message\n"
"--list list column headers only\n"
"--out file create or truncate \"file\" for all output\n"
@@ -2565,6 +2567,7 @@ void turbostat_loop()
{
int retval;
int restarted = 0;
+ int loops = 0;

restart:
restarted++;
@@ -2583,6 +2586,7 @@ void turbostat_loop()
restarted = 0;
gettimeofday(&tv_even, (struct timezone *)NULL);

+ loops = 0;
while (1) {
if (for_all_proc_cpus(cpu_is_not_present)) {
re_initialize();
@@ -2607,6 +2611,10 @@ void turbostat_loop()
compute_average(EVEN_COUNTERS);
format_all_counters(EVEN_COUNTERS);
flush_output_stdout();
+
+ if (iterations && (++loops >= iterations))
+ break;
+
nanosleep(&interval_ts, NULL);
if (snapshot_proc_sysfs_files())
goto restart;
@@ -2626,6 +2634,9 @@ void turbostat_loop()
compute_average(ODD_COUNTERS);
format_all_counters(ODD_COUNTERS);
flush_output_stdout();
+
+ if (iterations && (++loops >= iterations))
+ break;
}
}

@@ -4999,6 +5010,7 @@ void cmdline(int argc, char **argv)
{"Dump", no_argument, 0, 'D'},
{"debug", no_argument, 0, 'd'}, /* internal, not documented */
{"interval", required_argument, 0, 'i'},
+ {"iterations", required_argument, 0, 't'},
{"help", no_argument, 0, 'h'},
{"hide", required_argument, 0, 'H'}, // meh, -h taken by --help
{"Joules", no_argument, 0, 'J'},
@@ -5014,7 +5026,7 @@ void cmdline(int argc, char **argv)

progname = argv[0];

- while ((opt = getopt_long_only(argc, argv, "+C:c:Ddhi:JM:m:o:qST:v",
+ while ((opt = getopt_long_only(argc, argv, "+C:c:Ddhi:JM:m:o:qST:vt:",
long_options, &option_index)) != -1) {
switch (opt) {
case 'a':
@@ -5069,6 +5081,18 @@ void cmdline(int argc, char **argv)
case 'S':
summary_only++;
break;
+ case 't':
+ {
+ int loops = strtod(optarg, NULL);
+
+ if (loops <= 0) {
+ fprintf(outf, "loops %d should be positive number\n",
+ iterations);
+ exit(2);
+ }
+ iterations = loops;
+ }
+ break;
case 'T':
tcc_activation_temp_override = atoi(optarg);
break;
--
2.13.6

2018-04-11 09:33:23

by Artem Bityutskiy

Subject: Re: [PATCH][v2] tools/power turbostat: if --max_loop, print for specific time of loops

On Tue, 2018-04-10 at 22:51 +0800, Yu Chen wrote:
> + case 't':
> + {
> + int loops = strtod(optarg, NULL);
> +
> + if (loops <= 0) {
> + fprintf(outf, "loops %d should be positive number\n",
> + iterations);
> + exit(2);
> + }
> + iterations = loops;
> + }

What is the point of the additional {} scope and the 'loops' variable
in it? You could use the 'iterations' variable directly and simplify
the code.

Artem.

2018-04-11 10:15:47

by Chen Yu

Subject: Re: [PATCH][v2] tools/power turbostat: if --max_loop, print for specific time of loops

On Wed, Apr 11, 2018 at 12:29:04PM +0300, Artem Bityutskiy wrote:
> On Tue, 2018-04-10 at 22:51 +0800, Yu Chen wrote:
> > + case 't':
> > + {
> > + int loops = strtod(optarg, NULL);
> > +
> > + if (loops <= 0) {
> > + fprintf(outf, "loops %d should be positive number\n",
> > + iterations);
> > + exit(2);
> > + }
> > + iterations = loops;
> > + }
>
> What is the point of the additional {} scope and the 'loops' variable
> in it? You could use the 'iterations' variable directly and simplify
> the code.
Got your point, will change it.
>
> Artem.