github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-01-13 13:20:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/google/benchmark

Browse Source
This commit is contained in:
Dominic Hamon 2014-01-15 12:14:05 -08:00
commit 7b0fa3e1fa
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -7,7 +7,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
set(CMAKE_CXX_FLAGS "-Wall -Werror --std=c++0x")
set(CMAKE_CXX_FLAGS "-Wall -Werror -pedantic-errors --std=c++0x")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DDEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "-fno-strict-aliasing -O3 -DNDEBUG")

6
include/benchmark/benchmark.h
View File

@ -251,7 +251,7 @@ class State {
STATE_STARTING, // KeepRunning called, waiting for other threads
STATE_RUNNING, // Running and being timed
STATE_STOPPING, // Not being timed but waiting for other threads
STATE_STOPPED, // Stopped
STATE_STOPPED // Stopped
};
EState state_;
@ -291,7 +291,7 @@ class State {
std::unique_ptr<ThreadStats> stats_;
friend class internal::Benchmark;
DISALLOW_COPY_AND_ASSIGN(State);
DISALLOW_COPY_AND_ASSIGN(State)
};
// Interface for custom benchmark result printers.
@ -476,7 +476,7 @@ class Benchmark {
friend struct ::benchmark::internal::Benchmark::Instance;
friend void ::benchmark::internal::RunMatchingBenchmarks(
const std::string&, const BenchmarkReporter*);
DISALLOW_COPY_AND_ASSIGN(Benchmark);
DISALLOW_COPY_AND_ASSIGN(Benchmark)
};
// ------------------------------------------------------

8
src/benchmark.cc
View File

@ -507,7 +507,7 @@ class State::FastClock {
} while (done == 0);
}
DISALLOW_COPY_AND_ASSIGN(FastClock);
DISALLOW_COPY_AND_ASSIGN(FastClock)
};
struct State::ThreadStats {
@ -572,7 +572,7 @@ struct State::SharedState {
}
~SharedState() { pthread_mutex_destroy(&mu); }
DISALLOW_COPY_AND_ASSIGN(SharedState);
DISALLOW_COPY_AND_ASSIGN(SharedState)
};
namespace internal {
@ -793,9 +793,9 @@ void Benchmark::RunInstance(const Instance& b, const BenchmarkReporter* br) {
// Initialize the test runners.
State::SharedState state(&b);
{
std::unique_ptr<State> runners[b.threads];
std::vector<std::unique_ptr<State>> runners;
for (int i = 0; i < b.threads; ++i)
runners[i].reset(new State(&clock, &state, i));
runners.push_back(std::unique_ptr<State>(new State(&clock, &state, i)));
// Run them all.
for (int i = 0; i < b.threads; ++i) {