dolysis/snappy
3
0
Fork 0
mirror of https://github.com/google/snappy.git synced 2024-11-28 05:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a compile error when the HAVE_SYS_TIME_H flag is not set

Browse source 
As <sys/time.h> is guarded by HAVE_SYS_TIME_H, if the flag is missing,
gettimeofday will become an undefined identifier.
This commit is contained in:
Henry Lee 2019-08-22 16:02:05 +10:00
parent 44d84addf2
commit 1846b8a1ec
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
snappy-test.cc
View file

@ -101,7 +101,7 @@ void StartBenchmarkTiming() {
FILETIME dummy; FILETIME dummy;
CHECK(GetProcessTimes( CHECK(GetProcessTimes(
GetCurrentProcess(), &dummy, &dummy, &dummy, &benchmark_start_cpu)); GetCurrentProcess(), &dummy, &dummy, &dummy, &benchmark_start_cpu));
#else #elif defined HAVE_SYS_TIME_H
gettimeofday(&benchmark_start_real, NULL); gettimeofday(&benchmark_start_real, NULL);
if (getrusage(RUSAGE_SELF, &benchmark_start_cpu) == -1) { if (getrusage(RUSAGE_SELF, &benchmark_start_cpu) == -1) {
perror("getrusage(RUSAGE_SELF)"); perror("getrusage(RUSAGE_SELF)");
@ -141,7 +141,7 @@ void StopBenchmarkTiming() {
benchmark_cpu_time_us += benchmark_cpu_time_us +=
(stop_ulargeint.QuadPart - start_ulargeint.QuadPart + 5) / 10; (stop_ulargeint.QuadPart - start_ulargeint.QuadPart + 5) / 10;
#else // WIN32 #elif defined HAVE_SYS_TIME_H
struct timeval benchmark_stop_real; struct timeval benchmark_stop_real;
gettimeofday(&benchmark_stop_real, NULL); gettimeofday(&benchmark_stop_real, NULL);
benchmark_real_time_us += benchmark_real_time_us +=
@ -158,7 +158,7 @@ void StopBenchmarkTiming() {
benchmark_start_cpu.ru_utime.tv_sec); benchmark_start_cpu.ru_utime.tv_sec);
benchmark_cpu_time_us += (benchmark_stop_cpu.ru_utime.tv_usec - benchmark_cpu_time_us += (benchmark_stop_cpu.ru_utime.tv_usec -
benchmark_start_cpu.ru_utime.tv_usec); benchmark_start_cpu.ru_utime.tv_usec);
#endif // WIN32 #endif
benchmark_running = false; benchmark_running = false;
} }

6
snappy-test.h
View file

@ -198,7 +198,7 @@ class CycleTimer {
void Start() { void Start() {
#ifdef WIN32 #ifdef WIN32
QueryPerformanceCounter(&start_); QueryPerformanceCounter(&start_);
#else #elif defined HAVE_SYS_TIME_H
gettimeofday(&start_, NULL); gettimeofday(&start_, NULL);
#endif #endif
} }
@ -213,7 +213,7 @@ class CycleTimer {
double elapsed = static_cast<double>(stop.QuadPart - start_.QuadPart) / double elapsed = static_cast<double>(stop.QuadPart - start_.QuadPart) /
frequency.QuadPart; frequency.QuadPart;
real_time_us_ += elapsed * 1e6 + 0.5; real_time_us_ += elapsed * 1e6 + 0.5;
#else #elif defined HAVE_SYS_TIME_H
struct timeval stop; struct timeval stop;
gettimeofday(&stop, NULL); gettimeofday(&stop, NULL);
@ -230,7 +230,7 @@ class CycleTimer {
int64 real_time_us_; int64 real_time_us_;
#ifdef WIN32 #ifdef WIN32
LARGE_INTEGER start_; LARGE_INTEGER start_;
#else #elif defined HAVE_SYS_TIME_H
struct timeval start_; struct timeval start_;
#endif #endif
}; };