Move BenchTimer to tools as Timer

tools/timer/SysTimer_mach.cpp

Index: tools/timer/SysTimer_mach.cpp
diff --git a/bench/BenchSysTimer_mach.cpp b/tools/timer/SysTimer_mach.cpp
similarity index 52%
rename from bench/BenchSysTimer_mach.cpp
rename to tools/timer/SysTimer_mach.cpp
index 1f0a6b98615fc3733ea50a0b7c9357bd876253a4..aca12dee5203afb2109aa47d6d7b8a23c183e129 100644
--- a/bench/BenchSysTimer_mach.cpp
+++ b/tools/timer/SysTimer_mach.cpp
@@ -1,17 +1,12 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "BenchSysTimer_mach.h"
-
-//Time
-#include <mach/mach.h>
-#include <mach/mach_time.h>
+#include "SysTimer_mach.h"
 
-static time_value_t macCpuTime() {
+static time_value_t mac_cpu_time() {
     mach_port_t task = mach_task_self();
     if (task == MACH_PORT_NULL) {
         time_value_t none = {0, 0};
@@ -21,10 +16,9 @@ static time_value_t macCpuTime() {
     task_thread_times_info thread_info_data;
     mach_msg_type_number_t thread_info_count = TASK_THREAD_TIMES_INFO_COUNT;
     if (KERN_SUCCESS != task_info(task,
-                 TASK_THREAD_TIMES_INFO,
-                 reinterpret_cast<task_info_t>(&thread_info_data),
-                 &thread_info_count))
-    {
+                                  TASK_THREAD_TIMES_INFO,
+                                  reinterpret_cast<task_info_t>(&thread_info_data),
+                                  &thread_info_count)) {
         time_value_t none = {0, 0};
         return none;
     }
@@ -33,44 +27,40 @@ static time_value_t macCpuTime() {
     return thread_info_data.user_time;
 }
 
-static double intervalInMSec(const time_value_t start_clock
-                           , const time_value_t end_clock)
-{
+static double interval_in_ms(time_value_t start_clock, time_value_t end_clock) {
     double duration_clock;
     if ((end_clock.microseconds - start_clock.microseconds) < 0) {
-        duration_clock = (end_clock.seconds - start_clock.seconds-1)*1000;
-        duration_clock += (1000000
-                           + end_clock.microseconds
-                           - start_clock.microseconds) / 1000.0;
+        duration_clock = (end_clock.seconds - start_clock.seconds-1) * 1000;
+        duration_clock += (1000000 + end_clock.microseconds - start_clock.microseconds) / 1000.0;
     } else {
-        duration_clock = (end_clock.seconds - start_clock.seconds)*1000;
-        duration_clock += (end_clock.microseconds - start_clock.microseconds)
-                           / 1000.0;
+        duration_clock = (end_clock.seconds - start_clock.seconds) * 1000;
+        duration_clock += (end_clock.microseconds - start_clock.microseconds) / 1000.0;
     }
     return duration_clock;
 }
 
-void BenchSysTimer::startWall() {
-    this->fStartWall = mach_absolute_time();
+void SysTimer::startWall() {
+    fStartWall = mach_absolute_time();
 }
-void BenchSysTimer::startCpu() {
-    this->fStartCpu = macCpuTime();
+
+void SysTimer::startCpu() {
+    fStartCpu = mac_cpu_time();
 }
 
-double BenchSysTimer::endCpu() {
-    time_value_t end_cpu = macCpuTime();
-    return intervalInMSec(this->fStartCpu, end_cpu);
+double SysTimer::endCpu() {
+    time_value_t end_cpu = mac_cpu_time();
+    return interval_in_ms(fStartCpu, end_cpu);
 }
-double BenchSysTimer::endWall() {
+
+double SysTimer::endWall() {
     uint64_t end_wall = mach_absolute_time();
 
-    uint64_t elapsed = end_wall - this->fStartWall;
+    uint64_t elapsed = end_wall - fStartWall;
     mach_timebase_info_data_t sTimebaseInfo;
     if (KERN_SUCCESS != mach_timebase_info(&sTimebaseInfo)) {
         return 0;
     } else {
-        uint64_t elapsedNano = elapsed * sTimebaseInfo.numer
-                               / sTimebaseInfo.denom;
+        uint64_t elapsedNano = elapsed * sTimebaseInfo.numer / sTimebaseInfo.denom;
         return elapsedNano / 1000000.0;
     }
 }