asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf stat: Use *SEC_PER_*SEC macros

Browse source 
To match how this is done in the kernel.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-gym6yshewpdegt153u8v2q5r@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2016-08-08 14:57:04 -03:00
parent 16633ccff0
commit 310ebb9367
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/perf/builtin-stat.c
View file

@ -173,7 +173,7 @@ static inline void diff_timespec(struct timespec *r, struct timespec *a,
{ {
r->tv_sec = a->tv_sec - b->tv_sec; r->tv_sec = a->tv_sec - b->tv_sec;
if (a->tv_nsec < b->tv_nsec) { if (a->tv_nsec < b->tv_nsec) {
r->tv_nsec = a->tv_nsec + 1000000000L - b->tv_nsec; r->tv_nsec = a->tv_nsec + NSEC_PER_SEC - b->tv_nsec;
r->tv_sec--; r->tv_sec--;
} else { } else {
r->tv_nsec = a->tv_nsec - b->tv_nsec ; r->tv_nsec = a->tv_nsec - b->tv_nsec ;
@ -365,7 +365,7 @@ static void process_interval(void)
static void enable_counters(void) static void enable_counters(void)
{ {
if (initial_delay) if (initial_delay)
usleep(initial_delay * 1000); usleep(initial_delay * USEC_PER_MSEC);
/* /*
* We need to enable counters only if: * We need to enable counters only if:
@ -542,8 +542,8 @@ static int __run_perf_stat(int argc, const char **argv)
bool is_pipe = STAT_RECORD ? perf_stat.file.is_pipe : false; bool is_pipe = STAT_RECORD ? perf_stat.file.is_pipe : false;
if (interval) { if (interval) {
ts.tv_sec = interval / 1000; ts.tv_sec = interval / USEC_PER_MSEC;
ts.tv_nsec = (interval % 1000) * 1000000; ts.tv_nsec = (interval % USEC_PER_MSEC) * NSEC_PER_MSEC;
} else { } else {
ts.tv_sec = 1; ts.tv_sec = 1;
ts.tv_nsec = 0; ts.tv_nsec = 0;
@ -972,7 +972,7 @@ static void print_metric_header(void *ctx, const char *color __maybe_unused,
static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg) static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg)
{ {
FILE *output = stat_config.output; FILE *output = stat_config.output;
double msecs = avg / 1e6; double msecs = avg / NSEC_PER_MSEC;
const char *fmt_v, *fmt_n; const char *fmt_v, *fmt_n;
char name[25]; char name[25];
@ -1461,7 +1461,7 @@ static void print_footer(void)
if (!null_run) if (!null_run)
fprintf(output, "\n"); fprintf(output, "\n");
fprintf(output, " %17.9f seconds time elapsed", fprintf(output, " %17.9f seconds time elapsed",
avg_stats(&walltime_nsecs_stats)/1e9); avg_stats(&walltime_nsecs_stats) / NSEC_PER_SEC);
if (run_count > 1) { if (run_count > 1) {
fprintf(output, " "); fprintf(output, " ");
print_noise_pct(stddev_stats(&walltime_nsecs_stats), print_noise_pct(stddev_stats(&walltime_nsecs_stats),