diff --git a/test/nested.cc b/test/nested.cc index f273fbef..d3dfcd9d 100644 --- a/test/nested.cc +++ b/test/nested.cc @@ -239,7 +239,7 @@ bool testcase_nested::run() { const unsigned window_width = (!should_continue() || flipcoin_x4()) ? 0 : edge2window(salt); const unsigned head_count = edge2count(salt); - log_debug("nested: step #%zu (serial %" PRIu64 + log_debug("nested: step #%" PRIu64 " (serial %" PRIu64 ", window %u, count %u) salt %" PRIu64, nops_completed, serial, window_width, head_count, salt); diff --git a/test/test.cc b/test/test.cc index e339d2ca..beeba7ab 100644 --- a/test/test.cc +++ b/test/test.cc @@ -340,18 +340,18 @@ void testcase::report(size_t nops_done) { return; nops_completed += nops_done; - log_debug("== complete +%" PRIuPTR " iteration, total %" PRIuPTR " done", + log_debug("== complete +%" PRIuPTR " iteration, total %" PRIu64 " done", nops_done, nops_completed); kick_progress(true); if (config.signal_nops && !signalled && config.signal_nops <= nops_completed) { - log_trace(">> signal(n-ops %" PRIuPTR ")", nops_completed); + log_trace(">> signal(n-ops %" PRIu64 ")", nops_completed); if (!global::singlemode) osal_broadcast(config.actor_id); signalled = true; - log_trace("<< signal(n-ops %" PRIuPTR ")", nops_completed); + log_trace("<< signal(n-ops %" PRIu64 ")", nops_completed); } } diff --git a/test/test.h b/test/test.h index 68d3968b..8ecf5c46 100644 --- a/test/test.h +++ b/test/test.h @@ -148,7 +148,7 @@ protected: bool signalled{false}; bool need_speculum_assign{false}; - size_t nops_completed{0}; + uint64_t nops_completed{0}; chrono::time start_timestamp; keygen::buffer key; keygen::buffer data; diff --git a/test/ttl.cc b/test/ttl.cc index 096687d9..e3927d9c 100644 --- a/test/ttl.cc +++ b/test/ttl.cc @@ -139,7 +139,7 @@ bool testcase_ttl::run() { const unsigned window_width = (!should_continue() || flipcoin_x4()) ? 0 : edge2window(salt); unsigned head_count = edge2count(salt); - log_debug("ttl: step #%zu (serial %" PRIu64 + log_debug("ttl: step #%" PRIu64 " (serial %" PRIu64 ", window %u, count %u) salt %" PRIu64, nops_completed, serial, window_width, head_count, salt);