add walltime benchmark and fix unused variable.

src/walltime.cc

@@ -145,16 +145,12 @@ WallTimeImp::WallTimeImp()
 } // end anonymous namespace
 
 
-// WallTimeImp doesn't work when CPU Scaling is enabled. If CPU Scaling is
-// enabled at the start of the program then std::chrono::system_clock is used
-// instead.
-WallTime Now()
-{
-  static bool useWallTime = !CpuScalingEnabled();
-  if (useWallTime) {
+WallTime CPUWalltimeNow() {
   static WallTimeImp& imp = WallTimeImp::GetWallTimeImp();
   return imp.Now();
-  } else {
+}
+
+WallTime ChronoWalltimeNow() {
   typedef std::chrono::system_clock Clock;
   typedef std::chrono::duration<WallTime, std::chrono::seconds::period>
           FPSeconds;
@@ -162,6 +158,18 @@ WallTime Now()
                 "This type must be treated as a floating point type.");
   auto now = Clock::now().time_since_epoch();
   return std::chrono::duration_cast<FPSeconds>(now).count();
+}
+
+// WallTimeImp doesn't work when CPU Scaling is enabled. If CPU Scaling is
+// enabled at the start of the program then std::chrono::system_clock is used
+// instead.
+WallTime Now()
+{
+  static bool useWallTime = !CpuScalingEnabled();
+  if (useWallTime) {
+    return CPUWalltimeNow();
+  } else {
+    return ChronoWalltimeNow();
   }
 }
 
@@ -185,6 +193,7 @@ std::string DateTimeString(bool local) {
   }
   std::size_t written = std::strftime(storage, sizeof(storage), "%F %T", &timeinfo);
   CHECK(written < arraysize(storage));
+  ((void)written); // prevent unused variable in optimized mode.
   return std::string(storage);
 }
 

src/walltime.h

@@ -7,6 +7,8 @@ namespace benchmark {
 typedef double WallTime;
 
 namespace walltime {
+WallTime CPUWalltimeNow();
+WallTime ChronoWalltimeNow();
 WallTime Now();
 }  // end namespace walltime
 

test/CMakeLists.txt

@@ -32,3 +32,5 @@ compile_benchmark_test(cxx03_test)
 set_target_properties(cxx03_test
     PROPERTIES COMPILE_FLAGS "${CXX03_FLAGS}")
 add_test(cxx03 cxx03_test)
+
+compile_benchmark_test(walltime_test)

test/basic_test.cc

@@ -65,8 +65,8 @@ void BM_pause_during(benchmark::State& state) {
     state.ResumeTiming();
   }
 }
-BENCHMARK_TEST(BM_pause_during);
-BENCHMARK_TEST(BM_pause_during)->ThreadPerCpu();
+BENCHMARK(BM_pause_during);
+BENCHMARK(BM_pause_during)->ThreadPerCpu();
 
 void BM_pause_during_realtime(benchmark::State& state) {
   state.UseRealTime();
@@ -75,8 +75,8 @@ void BM_pause_during_realtime(benchmark::State& state) {
     state.ResumeTiming();
   }
 }
-BENCHMARK_TEST(BM_pause_during_realtime);
-BENCHMARK_TEST(BM_pause_during_realtime)->ThreadPerCpu();
+BENCHMARK(BM_pause_during_realtime);
+BENCHMARK(BM_pause_during_realtime)->ThreadPerCpu();
 
 void BM_spin_pause_after(benchmark::State& state) {
   while(state.KeepRunning()) {