Merge pull request #5569 from hiroyuki-sato/topic/tools-use-portable-…

…print TOOLS/PERF: Use portable format string like PRIu64
openucx · Aug 14, 2020 · 6cd8b3c · 6cd8b3c
2 parents ba69e14 + c7a5f50
commit 6cd8b3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/tools/perf/lib/uct_tests.cc b/src/tools/perf/lib/uct_tests.cc
@@ -10,6 +10,8 @@
 #  include "config.h"
 #endif
 
+#define __STDC_FORMAT_MACROS 1
+#include <inttypes.h>
 #include <tools/perf/lib/libperf_int.h>
 
 extern "C" {
@@ -503,7 +505,8 @@ class uct_perf_test_runner {
                     /* Wait until getting ACK from responder */
                     sn = get_recv_sn(recv_sn, m_perf.uct.recv_mem.mem_type);
                     ucs_assertv(UCS_CIRCULAR_COMPARE8(send_sn - 1, >=, sn),
-                                "recv_sn=%d iters=%ld", sn, m_perf.current.iters);
+                                "recv_sn=%d iters=%" PRIu64, sn,
+                                m_perf.current.iters);
 
                     while (UCS_CIRCULAR_COMPARE8(send_sn, >, sn + fc_window)) {
                         progress_responder();

diff --git a/src/tools/perf/perftest.c b/src/tools/perf/perftest.c
@@ -418,8 +418,8 @@ static void usage(const struct perftest_context *ctx, const char *program)
     printf("     -m <send mem type>[,<recv mem type>]\n");
     printf("                    memory type of message for sender and receiver (host)\n");
     print_memory_type_usage();
-    printf("     -n <iters>     number of iterations to run (%ld)\n", ctx->params.super.max_iter);
-    printf("     -w <iters>     number of warm-up iterations (%zu)\n",
+    printf("     -n <iters>     number of iterations to run (%"PRIu64")\n", ctx->params.super.max_iter);
+    printf("     -w <iters>     number of warm-up iterations (%"PRIu64")\n",
                                 ctx->params.super.warmup_iter);
     printf("     -c <cpulist>   set affinity to this CPU list (separated by comma) (off)\n");
     printf("     -O <count>     maximal number of uncompleted outstanding sends\n");