mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 05:04:00 +08:00
perf tools: Cast (struct timeval).tv_sec when printing
The musl-libc [1] defines (struct timeval).tv_sec as a 'long long' for arm and other architectures. The default build having a '-Wformat' flag, not casting the field when printing prevents from building perf. This patch casts the (struct timeval).tv_sec fields to the expected format. [1] git://git.musl-libc.org/musl Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Douglas.raillard@arm.com Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20210224182410.5366-1-Pierre.Gondois@arm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
21b7e35bdf
commit
ded2e511a8
tools/perf
@ -309,11 +309,11 @@ int bench_sched_messaging(int argc, const char **argv)
|
||||
num_groups, num_groups * 2 * num_fds,
|
||||
thread_mode ? "threads" : "processes");
|
||||
printf(" %14s: %lu.%03lu [sec]\n", "Total time",
|
||||
diff.tv_sec,
|
||||
(unsigned long) diff.tv_sec,
|
||||
(unsigned long) (diff.tv_usec / USEC_PER_MSEC));
|
||||
break;
|
||||
case BENCH_FORMAT_SIMPLE:
|
||||
printf("%lu.%03lu\n", diff.tv_sec,
|
||||
printf("%lu.%03lu\n", (unsigned long) diff.tv_sec,
|
||||
(unsigned long) (diff.tv_usec / USEC_PER_MSEC));
|
||||
break;
|
||||
default:
|
||||
|
@ -156,7 +156,7 @@ int bench_sched_pipe(int argc, const char **argv)
|
||||
result_usec += diff.tv_usec;
|
||||
|
||||
printf(" %14s: %lu.%03lu [sec]\n\n", "Total time",
|
||||
diff.tv_sec,
|
||||
(unsigned long) diff.tv_sec,
|
||||
(unsigned long) (diff.tv_usec / USEC_PER_MSEC));
|
||||
|
||||
printf(" %14lf usecs/op\n",
|
||||
@ -168,7 +168,7 @@ int bench_sched_pipe(int argc, const char **argv)
|
||||
|
||||
case BENCH_FORMAT_SIMPLE:
|
||||
printf("%lu.%03lu\n",
|
||||
diff.tv_sec,
|
||||
(unsigned long) diff.tv_sec,
|
||||
(unsigned long) (diff.tv_usec / USEC_PER_MSEC));
|
||||
break;
|
||||
|
||||
|
@ -54,7 +54,7 @@ int bench_syscall_basic(int argc, const char **argv)
|
||||
result_usec += diff.tv_usec;
|
||||
|
||||
printf(" %14s: %lu.%03lu [sec]\n\n", "Total time",
|
||||
diff.tv_sec,
|
||||
(unsigned long) diff.tv_sec,
|
||||
(unsigned long) (diff.tv_usec/1000));
|
||||
|
||||
printf(" %14lf usecs/op\n",
|
||||
@ -66,7 +66,7 @@ int bench_syscall_basic(int argc, const char **argv)
|
||||
|
||||
case BENCH_FORMAT_SIMPLE:
|
||||
printf("%lu.%03lu\n",
|
||||
diff.tv_sec,
|
||||
(unsigned long) diff.tv_sec,
|
||||
(unsigned long) (diff.tv_usec / 1000));
|
||||
break;
|
||||
|
||||
|
@ -1618,8 +1618,8 @@ static void print_clock_data(struct feat_fd *ff, FILE *fp)
|
||||
|
||||
fprintf(fp, "# clockid: %s (%u)\n", clockid_name(clockid), clockid);
|
||||
fprintf(fp, "# reference time: %s = %ld.%06d (TOD) = %ld.%09ld (%s)\n",
|
||||
tstr, tod_ns.tv_sec, (int) tod_ns.tv_usec,
|
||||
clockid_ns.tv_sec, clockid_ns.tv_nsec,
|
||||
tstr, (long) tod_ns.tv_sec, (int) tod_ns.tv_usec,
|
||||
(long) clockid_ns.tv_sec, clockid_ns.tv_nsec,
|
||||
clockid_name(clockid));
|
||||
}
|
||||
|
||||
|
@ -983,7 +983,7 @@ static void print_interval(struct perf_stat_config *config,
|
||||
if (config->interval_clear)
|
||||
puts(CONSOLE_CLEAR);
|
||||
|
||||
sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, config->csv_sep);
|
||||
sprintf(prefix, "%6lu.%09lu%s", (unsigned long) ts->tv_sec, ts->tv_nsec, config->csv_sep);
|
||||
|
||||
if ((num_print_interval == 0 && !config->csv_output) || config->interval_clear) {
|
||||
switch (config->aggr_mode) {
|
||||
|
Loading…
Reference in New Issue
Block a user