Merge pull request #3226

e4646379 keccak: fix mdlen bounds sanity checking (moneromooo-monero)
2e3e90ac pass large parameters by const ref, not value (moneromooo-monero)
61defd89 blockchain: sanity check number of precomputed hash of hash blocks (moneromooo-monero)
9af6b2d1 ringct: fix infinite loop in unused h2b function (moneromooo-monero)
8cea8d0c simplewallet: double check a new multisig wallet is multisig (moneromooo-monero)
9b98a6ac threadpool: catch exceptions in dtor, to avoid terminate (moneromooo-monero)
24803ed9 blockchain_export: fix buffer overflow in exporter (moneromooo-monero)
f3f7da62 perf_timer: rewrite to make it clear there is no division by zero (moneromooo-monero)
c6ea3df0 performance_tests: remove add_arg call stray extra param (moneromooo-monero)
fa6b4566 fuzz_tests: fix an uninitialized var in setup (moneromooo-monero)
03887f11 keccak: fix sanity check bounds test (moneromooo-monero)
ad11db91 blockchain_db: initialize m_open in base class ctor (moneromooo-monero)
bece67f9 miner: restore std::cout precision after modification (moneromooo-monero)
1aabd14c db_lmdb: check hard fork info drop succeeded (moneromooo-monero)

1 files changed, 3 insertions, 4 deletions

diff --git a/src/common/perf_timer.cpp b/src/common/perf_timer.cpp
index 41e23130d..16abdfd99 100644
--- a/src/common/perf_timer.cpp
+++ b/src/common/perf_timer.cpp
@@ -49,16 +49,15 @@ namespace
 #ifdef __x86_64__
   uint64_t get_ticks_per_ns()
   {
-    uint64_t t0 = epee::misc_utils::get_ns_count();
+    uint64_t t0 = epee::misc_utils::get_ns_count(), t1;
     uint64_t r0 = get_tick_count();
 
     while (1)
     {
-      uint64_t t = epee::misc_utils::get_ns_count();
-      if (t - t0 > 1*1000000000) break; // work one second
+      t1 = epee::misc_utils::get_ns_count();
+      if (t1 - t0 > 1*1000000000) break; // work one second
     }
 
-    uint64_t t1 = epee::misc_utils::get_ns_count();
     uint64_t r1 = get_tick_count();
     uint64_t tpns256 = 256 * (r1 - r0) / (t1 - t0);
     return tpns256 ? tpns256 : 1;