github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-04-02 15:40:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

address titus's comments

Browse Source
This commit is contained in:
Eric Fiselier 2015-03-03 10:55:42 -05:00
parent 2627b85358
commit a15727c270
2 changed files with 9 additions and 17 deletions

18
include/benchmark/minimal_benchmark.h
View File

@ -333,21 +333,21 @@ public:
int max_iterations() const { return max_iterations_; }
private:
bool started_;
unsigned total_iterations_, max_iterations_;
bool started_;
unsigned total_iterations_, max_iterations_;
bool has_range_x_;
int range_x_;
bool has_range_x_;
int range_x_;
bool has_range_y_;
int range_y_;
bool has_range_y_;
int range_y_;
int64_t bytes_processed_, items_processed_;
int64_t bytes_processed_, items_processed_;
public:
const int thread_index;
const int thread_index;
private:
BENCHMARK_DISALLOW_COPY_AND_ASSIGN(State);
BENCHMARK_DISALLOW_COPY_AND_ASSIGN(State);
};
typedef void(Function)(State&);

8
src/benchmark.cc
View File

@ -130,7 +130,6 @@ GetBenchmarkLock()
// benchmark identifies a family of related benchmarks to run.
static std::vector<Benchmark*>* families = NULL;
struct ThreadStats {
ThreadStats() : bytes_processed(0), items_processed(0) {}
int64_t bytes_processed;
@ -280,7 +279,6 @@ struct Benchmark::Instance {
bool multithreaded; // Is benchmark multi-threaded?
};
Benchmark::Benchmark(const std::string& name,
Function* f) EXCLUDES(GetBenchmarkLock())
: name_(name), function_(f), arg_count_(-1) {
@ -303,8 +301,6 @@ Benchmark::~Benchmark() EXCLUDES(GetBenchmarkLock()) {
}
Benchmark* Benchmark::Arg(int x) {
// TODO(remove)
//CHECK_EQ(function_.args(), 1) << "Wrong number of args for " << name_;
CHECK(arg_count_ == -1 || arg_count_ == 1);
arg_count_ = 1;
args_.emplace_back(x, -1);
@ -312,7 +308,6 @@ Benchmark* Benchmark::Arg(int x) {
}
Benchmark* Benchmark::Range(int start, int limit) {
//CHECK_EQ(function_.args(), 1) << "Wrong number of args for " << name_;
CHECK(arg_count_ == -1 || arg_count_ == 1);
arg_count_ = 1;
std::vector<int> arglist;
@ -325,7 +320,6 @@ Benchmark* Benchmark::Range(int start, int limit) {
}
Benchmark* Benchmark::DenseRange(int start, int limit) {
//CHECK_EQ(function_.args(), 1) << "Wrong number of args for " << name_;
CHECK(arg_count_ == -1 || arg_count_ == 1);
arg_count_ = 1;
CHECK_GE(start, 0);
@ -337,7 +331,6 @@ Benchmark* Benchmark::DenseRange(int start, int limit) {
}
Benchmark* Benchmark::ArgPair(int x, int y) {
//CHECK_EQ(function_.args(), 2) << "Wrong number of args for " << name_;
CHECK(arg_count_ == -1 || arg_count_ == 2);
arg_count_ = 2;
args_.emplace_back(x, y);
@ -345,7 +338,6 @@ Benchmark* Benchmark::ArgPair(int x, int y) {
}
Benchmark* Benchmark::RangePair(int lo1, int hi1, int lo2, int hi2) {
//CHECK_EQ(function_.args(), 2) << "Wrong number of args for " << name_;
CHECK(arg_count_ == -1 || arg_count_ == 2);
arg_count_ = 2;
std::vector<int> arglist1, arglist2;