github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2024-12-28 21:40:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/vladoovtcharov/benchmark into test_usercounters

Browse Source
This commit is contained in:
Joao Paulo Magalhaes 2017-04-29 19:27:53 +01:00
commit 5ed1b1dea7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/console_reporter.cc
View File

@ -133,7 +133,13 @@ void ConsoleReporter::PrintRunData(const Run& result) {
for (auto& c : result.counters) {
auto const& s = HumanReadableNumber(c.second.value);
printer(Out, COLOR_DEFAULT, " %s=%s", c.first.c_str(), s.c_str());
if (c.second.flags & Counter::Flags::kIsRate) {
std::string counter_rate = StrCat(" ", HumanReadableNumber(c.second.value), " ", c.first.c_str(), "/s");
printer(Out, COLOR_DEFAULT, " %*s", 13, counter_rate.c_str());
}
else {
printer(Out, COLOR_DEFAULT, " %s=%s", c.first.c_str(), s.c_str());
}
}
if (!rate.empty()) {

4
src/counter.cc
View File

@ -30,7 +30,7 @@ double Finish(Counter const& c, double cpu_time, double num_threads) {
void Finish(UserCounters *l, double cpu_time, double num_threads) {
for (auto &c : *l) {
c.second = Finish(c.second, cpu_time, num_threads);
c.second.value = Finish(c.second, cpu_time, num_threads);
}
}
@ -39,7 +39,7 @@ void Increment(UserCounters *l, UserCounters const& r) {
for (auto &c : *l) {
auto it = r.find(c.first);
if (it != r.end()) {
c.second = c.second + it->second;
c.second.value = c.second + it->second;
}
}
// add counters present in r, but not in *l