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

change how logging is done. Remove prefix

Browse Source
This commit is contained in:
Eric Fiselier 2015-03-10 18:07:16 -04:00
parent 1efdbed812
commit 37f4db64b4
2 changed files with 12 additions and 19 deletions

28
src/benchmark.cc
View File

@ -114,15 +114,6 @@ std::string* GetReportLabel() {
// cpu time?
bool use_real_time GUARDED_BY(GetBenchmarkLock());
// Return prefix to print in front of each reported line
static const char* Prefix() {
#ifdef NDEBUG
return "";
#else
return "DEBUG: ";
#endif
}
// TODO(ericwf): support MallocCounter.
//static benchmark::MallocCounter *benchmark_mc;
@ -615,7 +606,7 @@ void RunBenchmark(const benchmark::internal::Benchmark::Instance& b,
std::string mem;
while (true) {
// Try benchmark
VLOG(1) << "Running " << b.name << " for " << iters << "\n";
VLOG(2) << "Running " << b.name << " for " << iters << "\n";
{
MutexLock l(GetBenchmarkLock());
@ -650,8 +641,8 @@ void RunBenchmark(const benchmark::internal::Benchmark::Instance& b,
const double real_accumulated_time = timer_manager->real_time_used();
timer_manager.reset();
VLOG(1) << "Ran in " << cpu_accumulated_time << "/"
<< real_accumulated_time << "\n";
VLOG(2) << "Ran in " << cpu_accumulated_time << "/"
<< real_accumulated_time << "\n";
// Base decisions off of real time if requested by this benchmark.
double seconds = cpu_accumulated_time;
@ -709,7 +700,7 @@ void RunBenchmark(const benchmark::internal::Benchmark::Instance& b,
if (next_iters > kMaxIterations) {
next_iters = kMaxIterations;
}
VLOG(2) << "Next iters: " << next_iters << ", " << multiplier << "\n";
VLOG(3) << "Next iters: " << next_iters << ", " << multiplier << "\n";
iters = static_cast<int>(next_iters + 0.5);
}
}
@ -762,13 +753,14 @@ bool ConsoleReporter::ReportContext(const Context& context) const {
"timings may be noisy\n");
}
int prefix_len = static_cast<int>(std::strlen(Prefix()));
CHECK(prefix_len <= static_cast<int>(name_field_width_));
#ifndef NDEBUG
fprintf(stdout, "Build Type: DEBUG\n");
#endif
int output_width =
fprintf(stdout,
"%s%-*s %10s %10s %10s\n",
Prefix(),
static_cast<int>(name_field_width_) - prefix_len,
"%-*s %10s %10s %10s\n",
static_cast<int>(name_field_width_),
"Benchmark",
"Time(ns)", "CPU(ns)",
"Iterations");

3
src/sysinfo.cc
View File

@ -34,6 +34,7 @@
#include "check.h"
#include "cycleclock.h"
#include "internal_macros.h"
#include "log.h"
#include "sleep.h"
namespace benchmark {
@ -322,7 +323,7 @@ double MyCPUUsage() {
return value;
}
// Once MyCPUUsageCPUTimeNsLocked fails once fall back to getrusage().
std::cout << "Reading /proc/self/cputime_ns failed. Using getrusage().\n";
VLOG(1) << "Reading /proc/self/cputime_ns failed. Using getrusage().\n";
use_cputime_ns = false;
}
}