Skip to content

Commit

Permalink
tools/power turbostat: on SIGINT: sample, print and exit
Browse files Browse the repository at this point in the history
When running in interval-mode, catch interrupts
and print a final data record before exiting.

Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Len Brown committed Jun 1, 2018
1 parent 3f44a5c commit 8aa2ed0
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 0 deletions.
4 changes: 4 additions & 0 deletions tools/power/x86/turbostat/turbostat.8
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,10 @@ CPU PRF_CTRL

.fi

.SH SIGNALS

SIGINT will interrupt interval-mode.
The end-of-interval data will be collected and displayed before turbostat exits.
.SH NOTES

.B "turbostat "
Expand Down
30 changes: 30 additions & 0 deletions tools/power/x86/turbostat/turbostat.c
Original file line number Diff line number Diff line change
Expand Up @@ -2600,11 +2600,37 @@ int snapshot_proc_sysfs_files(void)
return 0;
}

int exit_requested;

static void signal_handler (int signal)
{
switch (signal) {
case SIGINT:
exit_requested = 1;
if (debug)
fprintf(stderr, " SIGINT\n");
break;
}
}

void setup_signal_handler(void)
{
struct sigaction sa;

memset(&sa, 0, sizeof(sa));

sa.sa_handler = &signal_handler;

if (sigaction(SIGINT, &sa, NULL) < 0)
err(1, "sigaction SIGINT");
}
void turbostat_loop()
{
int retval;
int restarted = 0;

setup_signal_handler();

restart:
restarted++;

Expand Down Expand Up @@ -2646,6 +2672,8 @@ void turbostat_loop()
compute_average(EVEN_COUNTERS);
format_all_counters(EVEN_COUNTERS);
flush_output_stdout();
if (exit_requested)
break;
nanosleep(&interval_ts, NULL);
if (snapshot_proc_sysfs_files())
goto restart;
Expand All @@ -2665,6 +2693,8 @@ void turbostat_loop()
compute_average(ODD_COUNTERS);
format_all_counters(ODD_COUNTERS);
flush_output_stdout();
if (exit_requested)
break;
}
}

Expand Down

0 comments on commit 8aa2ed0

Please sign in to comment.