1
0
mirror of https://github.com/google/benchmark.git synced 2025-04-02 15:40:53 +08:00

Merge branch 'new-api' into api-merge

This commit is contained in:
Eric Fiselier 2015-02-19 16:12:24 -05:00
commit 566373912c

View File

@ -650,6 +650,8 @@ void RunBenchmark(const benchmark::Benchmark::Instance& b,
// If our last run was at least 10% of FLAGS_benchmark_min_time then we
// use the multiplier directly. Otherwise we use at most 10 times
// expansion.
// NOTE: When the last run was at least 10% of the min time the max
// expansion should be 14x.
bool is_significant = (seconds / FLAGS_benchmark_min_time) > 0.1;
multiplier = is_significant ? multiplier : std::min(10.0, multiplier);
// TODO(ericwf) I don't think this branch is reachable.