Merge branch 'TwoBugs' into StatsPure

db4248e2 · pleroy · e189ec02 · 0d9a060f · db4248e2
Commit db4248e2 authored Jun 04, 2014 by pleroy
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

benchmark.cc src/benchmark.cc +5 -1

No files found.
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -974,7 +974,8 @@ State::State(FastClock* clock, SharedState* s, int t)
 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;
@@ -1015,6 +1016,9 @@ bool State::KeepRunning() {
    }
  }
+  if (ret) {
+    ++iterations_;
+  }
  return ret;
 }