leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf stat: Avoid fractional digits for integer scales

Browse Source 
When the scaling factor is a full integer don't display fractional
digits. This avoids unnecessary .00 output for topdown metrics with
scale factors.

v2: Remove redundant check.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1462489447-31832-7-git-send-email-andi@firstfloor.org
[ Rename 'round' to 'stat_round' as 'round' is defined in math.h,
  included by this patch, and this breaks the build on ubuntu 12.04 ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Andi Kleen 2016-05-05 16:04:03 -07:00 committed by Arnaldo Carvalho de Melo
parent 3f56e687a1
commit e3b03b6c1a
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/perf/builtin-stat.c
View File

@ -66,6 +66,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <locale.h> #include <locale.h>
#include <math.h>
#define DEFAULT_SEPARATOR " " #define DEFAULT_SEPARATOR " "
#define CNTR_NOT_SUPPORTED "<not supported>" #define CNTR_NOT_SUPPORTED "<not supported>"
@ -986,12 +987,12 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
const char *fmt; const char *fmt;
if (csv_output) { if (csv_output) {
fmt = sc != 1.0 ? "%.2f%s" : "%.0f%s"; fmt = floor(sc) != sc ? "%.2f%s" : "%.0f%s";
} else { } else {
if (big_num) if (big_num)
fmt = sc != 1.0 ? "%'18.2f%s" : "%'18.0f%s"; fmt = floor(sc) != sc ? "%'18.2f%s" : "%'18.0f%s";
else else
fmt = sc != 1.0 ? "%18.2f%s" : "%18.0f%s"; fmt = floor(sc) != sc ? "%18.2f%s" : "%18.0f%s";
} }
aggr_printout(evsel, id, nr); aggr_printout(evsel, id, nr);
@ -1995,7 +1996,7 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused,
union perf_event *event, union perf_event *event,
struct perf_session *session) struct perf_session *session)
{ {
struct stat_round_event *round = &event->stat_round; struct stat_round_event *stat_round = &event->stat_round;
struct perf_evsel *counter; struct perf_evsel *counter;
struct timespec tsh, *ts = NULL; struct timespec tsh, *ts = NULL;
const char **argv = session->header.env.cmdline_argv; const char **argv = session->header.env.cmdline_argv;
@ -2004,12 +2005,12 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused,
evlist__for_each(evsel_list, counter) evlist__for_each(evsel_list, counter)
perf_stat_process_counter(&stat_config, counter); perf_stat_process_counter(&stat_config, counter);
if (round->type == PERF_STAT_ROUND_TYPE__FINAL) if (stat_round->type == PERF_STAT_ROUND_TYPE__FINAL)
update_stats(&walltime_nsecs_stats, round->time); update_stats(&walltime_nsecs_stats, stat_round->time);
if (stat_config.interval && round->time) { if (stat_config.interval && stat_round->time) {
tsh.tv_sec = round->time / NSECS_PER_SEC; tsh.tv_sec = stat_round->time / NSECS_PER_SEC;
tsh.tv_nsec = round->time % NSECS_PER_SEC; tsh.tv_nsec = stat_round->time % NSECS_PER_SEC;
ts = &tsh; ts = &tsh;
} }