diff options
Diffstat (limited to 'tools/power/x86/turbostat/turbostat.c')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 28 | 
1 files changed, 15 insertions, 13 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 8b2d37b59c9..3c6f7808efa 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -162,19 +162,21 @@ void print_header(void)  void dump_cnt(struct counters *cnt)  { -	fprintf(stderr, "package: %d ", cnt->pkg); -	fprintf(stderr, "core:: %d ", cnt->core); -	fprintf(stderr, "CPU: %d ", cnt->cpu); -	fprintf(stderr, "TSC: %016llX\n", cnt->tsc); -	fprintf(stderr, "c3: %016llX\n", cnt->c3); -	fprintf(stderr, "c6: %016llX\n", cnt->c6); -	fprintf(stderr, "c7: %016llX\n", cnt->c7); -	fprintf(stderr, "aperf: %016llX\n", cnt->aperf); -	fprintf(stderr, "pc2: %016llX\n", cnt->pc2); -	fprintf(stderr, "pc3: %016llX\n", cnt->pc3); -	fprintf(stderr, "pc6: %016llX\n", cnt->pc6); -	fprintf(stderr, "pc7: %016llX\n", cnt->pc7); -	fprintf(stderr, "msr0x%x: %016llX\n", extra_msr_offset, cnt->extra_msr); +	if (!cnt) +		return; +	if (cnt->pkg) fprintf(stderr, "package: %d ", cnt->pkg); +	if (cnt->core) fprintf(stderr, "core:: %d ", cnt->core); +	if (cnt->cpu) fprintf(stderr, "CPU: %d ", cnt->cpu); +	if (cnt->tsc) fprintf(stderr, "TSC: %016llX\n", cnt->tsc); +	if (cnt->c3) fprintf(stderr, "c3: %016llX\n", cnt->c3); +	if (cnt->c6) fprintf(stderr, "c6: %016llX\n", cnt->c6); +	if (cnt->c7) fprintf(stderr, "c7: %016llX\n", cnt->c7); +	if (cnt->aperf) fprintf(stderr, "aperf: %016llX\n", cnt->aperf); +	if (cnt->pc2) fprintf(stderr, "pc2: %016llX\n", cnt->pc2); +	if (cnt->pc3) fprintf(stderr, "pc3: %016llX\n", cnt->pc3); +	if (cnt->pc6) fprintf(stderr, "pc6: %016llX\n", cnt->pc6); +	if (cnt->pc7) fprintf(stderr, "pc7: %016llX\n", cnt->pc7); +	if (cnt->extra_msr) fprintf(stderr, "msr0x%x: %016llX\n", extra_msr_offset, cnt->extra_msr);  }  void dump_list(struct counters *cnt)  |