Merge f9e71dd into 61f570e

Author: hydroo

include/benchmark/benchmark_api.h

@@ -600,6 +600,8 @@ class Benchmark {
   //    Foo in 16 threads
   Benchmark* ThreadRange(int min_threads, int max_threads);
 
+  Benchmark* ThreadRange2(int min_threads, int max_threads);
+
   // Equivalent to ThreadRange(NumCPUs(), NumCPUs())
   Benchmark* ThreadPerCpu();
 

src/benchmark.cc

@@ -387,10 +387,12 @@ class BenchmarkImp {
   void ComplexityLambda(BigOFunc* complexity);
   void Threads(int t);
   void ThreadRange(int min_threads, int max_threads);
+  void ThreadRange2(int min_threads, int max_threads);
   void ThreadPerCpu();
   void SetName(const char* name);
 
   static void AddRange(std::vector<int>* dst, int lo, int hi, int mult);
+  static void AddRange2(std::vector<int>* dst, int lo, int hi, int stride);
 
   int ArgsCnt() const { return args_.empty() ? -1 : static_cast<int>(args_.front().size()); }
 
@@ -642,6 +644,13 @@ void BenchmarkImp::ThreadRange(int min_threads, int max_threads) {
   AddRange(&thread_counts_, min_threads, max_threads, 2);
 }
 
+void BenchmarkImp::ThreadRange2(int min_threads, int max_threads) {
+  CHECK_GT(min_threads, 0);
+  CHECK_GE(max_threads, min_threads);
+
+  AddRange2(&thread_counts_, min_threads, max_threads, 1);
+}
+
 void BenchmarkImp::ThreadPerCpu() {
   static int num_cpus = NumCPUs();
   thread_counts_.push_back(num_cpus);
@@ -674,6 +683,17 @@ void BenchmarkImp::AddRange(std::vector<int>* dst, int lo, int hi, int mult) {
   }
 }
 
+void BenchmarkImp::AddRange2(std::vector<int>* dst, int lo, int hi, int stride) {
+  CHECK_GE(lo, 0);
+  CHECK_GE(hi, lo);
+  CHECK_GE(stride, 1);
+
+  for (auto i = lo; i < hi; i += stride) {
+    dst->push_back(i);
+  }
+  dst->push_back(hi);
+}
+
 Benchmark::Benchmark(const char* name)
     : imp_(new BenchmarkImp(name))
 {
@@ -781,6 +801,11 @@ Benchmark* Benchmark::ThreadRange(int min_threads, int max_threads) {
   return this;
 }
 
+Benchmark* Benchmark::ThreadRange2(int min_threads, int max_threads) {
+  imp_->ThreadRange2(min_threads, max_threads);
+  return this;
+}
+
 Benchmark* Benchmark::ThreadPerCpu() {
   imp_->ThreadPerCpu();
   return this;