Merge bitcoin#9200: bench: Fix subtle counting issue when rescaling i…

…teration count e0a9cb2 bench: Fix subtle counting issue when rescaling iteration count (Wladimir J. van der Laan)
practicalswift · Nov 22, 2016 · 55b2edd · 55b2edd
2 parents e4dbeb9 + e0a9cb2
commit 55b2edd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
@@ -64,8 +64,11 @@ bool State::KeepRunning()
           return true;
         }
         if (elapsed*16 < maxElapsed) {
-          countMask = ((countMask<<1)|1) & ((1LL<<60)-1);
-          countMaskInv = 1./(countMask+1);
+          uint64_t newCountMask = ((countMask<<1)|1) & ((1LL<<60)-1);
+          if ((count & newCountMask)==0) {
+              countMask = newCountMask;
+              countMaskInv = 1./(countMask+1);
+          }
         }
     }
     lastTime = now;