diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | snappy-test.cc | 39 | ||||
| -rw-r--r-- | snappy-test.h | 3 |
3 files changed, 40 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 692555d..e2864d7 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_SUBST([LIBTOOL_DEPS]) AC_PROG_CXX AC_LANG([C++]) AC_C_BIGENDIAN -AC_CHECK_HEADERS([stdint.h stddef.h sys/mman.h]) +AC_CHECK_HEADERS([stdint.h stddef.h sys/mman.h sys/resource.h windows.h]) # Don't use AC_FUNC_MMAP, as it checks for mappings of already-mapped memory, # which we don't need (and does not exist on Windows). diff --git a/snappy-test.cc b/snappy-test.cc index 4fb3cf4..e43a556 100644 --- a/snappy-test.cc +++ b/snappy-test.cc @@ -30,6 +30,10 @@ #include "snappy-test.h" +#ifdef HAVE_WINDOWS_H +#include <windows.h> +#endif + #include <algorithm> DEFINE_bool(run_microbenchmarks, true, @@ -64,20 +68,31 @@ int64 benchmark_cpu_time_us = 0; string *benchmark_label = NULL; int64 benchmark_bytes_processed = 0; -struct timeval benchmark_start_real; -struct rusage benchmark_start_cpu; - void ResetBenchmarkTiming() { benchmark_real_time_us = 0; benchmark_cpu_time_us = 0; } +struct timeval benchmark_start_real; + +#ifdef WIN32 +FILETIME benchmark_start_cpu; +#else // WIN32 +struct rusage benchmark_start_cpu; +#endif // WIN32 + void StartBenchmarkTiming() { gettimeofday(&benchmark_start_real, NULL); +#ifdef WIN32 + FILETIME dummy; + CHECK(GetProcessTimes( + GetCurrentProcess(), &dummy, &dummy, &dummy, &benchmark_start_cpu)); +#else if (getrusage(RUSAGE_SELF, &benchmark_start_cpu) == -1) { perror("getrusage(RUSAGE_SELF)"); exit(1); } +#endif benchmark_running = true; } @@ -92,6 +107,22 @@ void StopBenchmarkTiming() { benchmark_real_time_us += (benchmark_stop_real.tv_usec - benchmark_start_real.tv_usec); +#ifdef WIN32 + FILETIME benchmark_stop_cpu, dummy; + CHECK(GetProcessTimes( + GetCurrentProcess(), &dummy, &dummy, &dummy, &benchmark_stop_cpu)); + + ULARGE_INTEGER start_ulargeint; + start_ulargeint.LowPart = benchmark_start_cpu.dwLowDateTime; + start_ulargeint.HighPart = benchmark_start_cpu.dwHighDateTime; + + ULARGE_INTEGER stop_ulargeint; + stop_ulargeint.LowPart = benchmark_stop_cpu.dwLowDateTime; + stop_ulargeint.HighPart = benchmark_stop_cpu.dwHighDateTime; + + benchmark_cpu_time_us += + (stop_ulargeint.QuadPart - start_ulargeint.QuadPart + 5) / 10; +#else // WIN32 struct rusage benchmark_stop_cpu; if (getrusage(RUSAGE_SELF, &benchmark_stop_cpu) == -1) { perror("getrusage(RUSAGE_SELF)"); @@ -101,6 +132,8 @@ void StopBenchmarkTiming() { benchmark_start_cpu.ru_utime.tv_sec); benchmark_cpu_time_us += (benchmark_stop_cpu.ru_utime.tv_usec - benchmark_start_cpu.ru_utime.tv_usec); +#endif // WIN32 + benchmark_running = false; } diff --git a/snappy-test.h b/snappy-test.h index e99b884..18f5b1b 100644 --- a/snappy-test.h +++ b/snappy-test.h @@ -40,7 +40,10 @@ #include <sys/mman.h> #endif +#ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> +#endif + #include <sys/time.h> #include <string> |