dolysis
/
benchmark
mirror of https://github.com/google/benchmark.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address Dominic's (stylistic) remarks.

This commit is contained in:
Jean-Louis Leroy 2015-09-08 15:18:43 -04:00
parent 5ec78d7d44
commit 0f5503e9a2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cycleclock.h
View File

@ -41,7 +41,7 @@ extern "C" uint64_t __rdtsc();
#pragma intrinsic(__rdtsc)
#endif
#if !defined(OS_WINDOWS)
#ifndef OS_WINDOWS
#include <sys/time.h>
#endif

2
src/sysinfo.cc
View File

@ -305,7 +305,7 @@ static double MyCPUUsageRUsage() {
user.HighPart = user_time.dwHighDateTime;
user.LowPart = user_time.dwLowDateTime;
return (static_cast<double>(kernel.QuadPart) +
static_cast<double>(user.QuadPart)) / 1.0E7;
static_cast<double>(user.QuadPart)) * 1e-7;
#endif // OS_WINDOWS
}

8
src/walltime.cc
View File

@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "walltime.h"
#include "benchmark/macros.h"
#include "internal_macros.h"
#include "walltime.h"
#if defined(OS_WINDOWS)
#include <time.h>
@ -110,7 +110,7 @@ private:
ularge.LowPart = file_time.dwLowDateTime;
ularge.HighPart = file_time.dwHighDateTime;
tv.tv_sec = (long)((ularge.QuadPart - epoch) / 10000000L);
tv.tv_sec = (long)((ularge.QuadPart - epoch) / (10L * 1000 * 1000));
tv.tv_usec = (long)(system_time.wMilliseconds * 1000);
#else
gettimeofday(&tv, nullptr);
@ -167,8 +167,8 @@ WallTimeImp::WallTimeImp()
cycles_per_second_(0), seconds_per_cycle_(0.0),
last_adjust_time_(0), drift_adjust_(0),
max_interval_cycles_(0) {
const double kMaxErrorInterval = 100e-6;
cycles_per_second_ = static_cast<int64_t>(CyclesPerSecond());
const double kMaxErrorInterval = 100e-6;
cycles_per_second_ = static_cast<int64_t>(CyclesPerSecond());
CHECK(cycles_per_second_ != 0);
seconds_per_cycle_ = 1.0 / cycles_per_second_;
max_interval_cycles_ =