github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-03-06 07:10:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #146 from efcs/fix-iteration-type

Browse Source 
Fix issue #141. Use size_t instead of int for the iteration count
This commit is contained in:
Dominic Hamon 2015-10-02 12:06:11 -07:00
commit 414941295e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/benchmark.cc
View File

@ -101,7 +101,7 @@ bool IsZero(double n) {
// For non-dense Range, intermediate values are powers of kRangeMultiplier. // For non-dense Range, intermediate values are powers of kRangeMultiplier.
static const int kRangeMultiplier = 8; static const int kRangeMultiplier = 8;
static const int kMaxIterations = 1000000000; static const size_t kMaxIterations = 1000000000;
bool running_benchmark = false; bool running_benchmark = false;
@ -596,7 +596,7 @@ namespace {
// Execute one thread of benchmark b for the specified number of iterations. // Execute one thread of benchmark b for the specified number of iterations.
// Adds the stats collected for the thread into *total. // Adds the stats collected for the thread into *total.
void RunInThread(const benchmark::internal::Benchmark::Instance* b, void RunInThread(const benchmark::internal::Benchmark::Instance* b,
int iters, int thread_id, size_t iters, int thread_id,
ThreadStats* total) EXCLUDES(GetBenchmarkLock()) { ThreadStats* total) EXCLUDES(GetBenchmarkLock()) {
State st(iters, b->has_arg1, b->arg1, b->has_arg2, b->arg2, thread_id); State st(iters, b->has_arg1, b->arg1, b->has_arg2, b->arg2, thread_id);
b->benchmark->Run(st); b->benchmark->Run(st);
@ -613,7 +613,7 @@ void RunInThread(const benchmark::internal::Benchmark::Instance* b,
void RunBenchmark(const benchmark::internal::Benchmark::Instance& b, void RunBenchmark(const benchmark::internal::Benchmark::Instance& b,
BenchmarkReporter* br) EXCLUDES(GetBenchmarkLock()) { BenchmarkReporter* br) EXCLUDES(GetBenchmarkLock()) {
int iters = 1; size_t iters = 1;
std::vector<BenchmarkReporter::Run> reports; std::vector<BenchmarkReporter::Run> reports;

3
test/benchmark_test.cc
View File

@ -101,8 +101,7 @@ static void BM_Sequential(benchmark::State& state) {
for (int i = state.range_x(); --i; ) for (int i = state.range_x(); --i; )
c.push_back(v); c.push_back(v);
} }
const int64_t items_processed = const size_t items_processed = state.iterations() * state.range_x();
static_cast<int64_t>(state.iterations()) * state.range_x();
state.SetItemsProcessed(items_processed); state.SetItemsProcessed(items_processed);
state.SetBytesProcessed(items_processed * sizeof(v)); state.SetBytesProcessed(items_processed * sizeof(v));
} }