LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Packages Projects Releases 32 Wiki Activity

Merge #9712: bench: Fix initialization order in registration

Browse source 
29c5328 bench: Fix initialization order in registration (Wladimir J. van der Laan)
This commit is contained in:
MarcoFalke 2017-02-08 04:40:19 +01:00
parent b709fe7ffc 29c53289a9
commit d304fef374
No known key found for this signature in database
GPG key ID: 2D7F2372E50FE137
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/bench/bench.cpp
View file

@ -9,7 +9,10 @@
#include <iomanip>
#include <sys/time.h>
std::map<std::string, benchmark::BenchFunction> benchmark::BenchRunner::benchmarks;
benchmark::BenchRunner::BenchmarkMap &benchmark::BenchRunner::benchmarks() {
static std::map<std::string, benchmark::BenchFunction> benchmarks_map;
return benchmarks_map;
}
static double gettimedouble(void) {
struct timeval tv;
@ -19,7 +22,7 @@ static double gettimedouble(void) {
benchmark::BenchRunner::BenchRunner(std::string name, benchmark::BenchFunction func)
{
benchmarks.insert(std::make_pair(name, func));
benchmarks().insert(std::make_pair(name, func));
}
void
@ -29,12 +32,9 @@ benchmark::BenchRunner::RunAll(double elapsedTimeForOne)
std::cout << "#Benchmark" << "," << "count" << "," << "min" << "," << "max" << "," << "average" << ","
<< "min_cycles" << "," << "max_cycles" << "," << "average_cycles" << "\n";
for (std::map<std::string,benchmark::BenchFunction>::iterator it = benchmarks.begin();
it != benchmarks.end(); ++it) {
State state(it->first, elapsedTimeForOne);
benchmark::BenchFunction& func = it->second;
func(state);
for (const auto &p: benchmarks()) {
State state(p.first, elapsedTimeForOne);
p.second(state);
}
perf_fini();
}

3
src/bench/bench.h
View file

@ -63,7 +63,8 @@ namespace benchmark {
class BenchRunner
{
static std::map<std::string, BenchFunction> benchmarks;
typedef std::map<std::string, BenchFunction> BenchmarkMap;
static BenchmarkMap &benchmarks();
public:
BenchRunner(std::string name, BenchFunction func);