perf daemon: Fix the build on more 32-bit architectures
Arnaldo Carvalho de Melo
maintainerPATCH 1/1 perf daemon: Fix the build on more 32-bit architectures
FYI: I'm carrying this on perf-tools-next.
The previous attempt fixed the build on debian:experimental-x-mipsel, but when building on a larger set of containers I noticed it broke the build on some other 32-bit architectures such as:
42 7.87 ubuntu:18.04-x-arm : FAIL gcc version 7.5.0 (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04)
builtin-daemon.c: In function 'cmd_session_list':
builtin-daemon.c:692:16: error: format '%llu' expects argument of type 'long long unsigned int', but argument 4 has type 'long int' [-Werror=format=]
fprintf(out, "%c%" PRIu64,
^~~~~
builtin-daemon.c:694:13:
csv_sep, (curr - daemon->start) / 60);
~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from builtin-daemon.c:3:0:
/usr/arm-linux-gnueabihf/include/inttypes.h:105:34: note: format string is defined here
# define PRIu64 __PRI64_PREFIX "u"So lets cast that time_t (32-bit/64-bit) to uint64_t to make sure it builds everywhere.
Fixes 4bbe6002931954bb ("perf daemon: Fix the build on 32-bit architectures")
Cc Adrian Hunter <[email protected]>
Cc Ian Rogers <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kan Liang <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-daemon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/builtin-daemon.c +4 -4
@@ -691,7 +691,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)fprintf (out,"%c%" PRIu64,/* session up time */ - csv_sep, (curr - daemon->start) /60 ); + csv_sep, (uint64_t )((curr - daemon->start) /60 ));fprintf (out,"\n" ); }else {
@@ -702,7 +702,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)fprintf (out," lock: %s/lock\n" , daemon->base);fprintf (out," up: %" PRIu64" minutes\n" , - (curr - daemon->start) /60 ); + (uint64_t )((curr - daemon->start) /60 )); } }
@@ -730,7 +730,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)fprintf (out,"%c%" PRIu64,/* session up time */ - csv_sep, (curr - session->start) /60 ); + csv_sep, (uint64_t )((curr - session->start) /60 ));fprintf (out,"\n" ); }else {
@@ -747,7 +747,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)fprintf (out," ack: %s/%s\n" , session->base,SESSION_ACK );fprintf (out," up: %" PRIu64" minutes\n" , - (curr - session->start) /60 ); + (uint64_t )((curr - session->start) /60 )); } }
Signature · 1 line
2.45.2