generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a vector of benchmarks and new for loop syntax.

Browse Source 
Change-Id: Ib1f1250e7786770083ed6a478677a893b2075a93
This commit is contained in:
Elliott Hughes 2015-01-15 17:10:42 -08:00
parent 594db0f1b2
commit e48f533c95
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
benchmarks/benchmark_main.cpp
View File

@ -31,11 +31,10 @@ static int64_t g_benchmark_total_time_ns;
static int64_t g_benchmark_start_time_ns; static int64_t g_benchmark_start_time_ns;
static int g_name_column_width = 20; static int g_name_column_width = 20;
typedef std::map<std::string, ::testing::Benchmark*> BenchmarkMap; typedef std::vector<::testing::Benchmark*> BenchmarkList;
typedef BenchmarkMap::iterator BenchmarkMapIt;
static BenchmarkMap& Benchmarks() { static BenchmarkList& Benchmarks() {
static BenchmarkMap benchmarks; static BenchmarkList benchmarks;
return benchmarks; return benchmarks;
} }
@ -102,7 +101,7 @@ void Benchmark::Register(const char* name, void (*fn)(int), void (*fn_range)(int
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
Benchmarks().insert(std::make_pair(name, this)); Benchmarks().push_back(this);
} }
void Benchmark::Run() { void Benchmark::Run() {
@ -204,14 +203,13 @@ int main(int argc, char* argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
for (BenchmarkMapIt it = Benchmarks().begin(); it != Benchmarks().end(); ++it) { for (auto& b : Benchmarks()) {
int name_width = static_cast<int>(strlen(it->second->Name())); int name_width = static_cast<int>(strlen(b->Name()));
g_name_column_width = std::max(g_name_column_width, name_width); g_name_column_width = std::max(g_name_column_width, name_width);
} }
bool need_header = true; bool need_header = true;
for (BenchmarkMapIt it = Benchmarks().begin(); it != Benchmarks().end(); ++it) { for (auto& b : Benchmarks()) {
::testing::Benchmark* b = it->second;
if (b->ShouldRun(argc, argv)) { if (b->ShouldRun(argc, argv)) {
if (need_header) { if (need_header) {
printf("%-*s %10s %10s\n", g_name_column_width, "", "iterations", "ns/op"); printf("%-*s %10s %10s\n", g_name_column_width, "", "iterations", "ns/op");
@ -225,8 +223,8 @@ int main(int argc, char* argv[]) {
if (need_header) { if (need_header) {
fprintf(stderr, "No matching benchmarks!\n"); fprintf(stderr, "No matching benchmarks!\n");
fprintf(stderr, "Available benchmarks:\n"); fprintf(stderr, "Available benchmarks:\n");
for (BenchmarkMapIt it = Benchmarks().begin(); it != Benchmarks().end(); ++it) { for (auto& b : Benchmarks()) {
fprintf(stderr, " %s\n", it->second->Name()); fprintf(stderr, " %s\n", b->Name());
} }
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }