commit 0d9a060f5b0d55d7fc37823c612883e465b00d46
author pleroy <phl+personal@google.com> Wed Jun 04 21:21:24 2014 +0200
committer pleroy <phl+personal@google.com> Wed Jun 04 21:21:24 2014 +0200
tree a3cdf8805bcd71dcebb2c5543dd6b91da91662be
parent 556002bec1d76bc2c3ea0c688dd0d7aa4caa1c78

Two bug fixes in KeepRunning.

src/benchmark.cc

diff --git a/src/benchmark.cc b/src/benchmark.cc
index 1ad2e32..393890d 100644
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -955,7 +955,8 @@
 bool State::KeepRunning() {
   // Fast path
   if ((FLAGS_benchmark_iterations == 0 &&
-       !clock_->HasReached(stop_time_micros_ + pause_time_)) ||
+       !clock_->HasReached(stop_time_micros_ +
+                           kNumMicrosPerSecond * pause_time_)) ||
       iterations_ < FLAGS_benchmark_iterations) {
     ++iterations_;
     return true;
@@ -996,6 +997,9 @@
     }
   }
 
+  if (ret) {
+    ++iterations_;
+  }
   return ret;
 }