Commit 0dacfa47 authored by Christopher Dykes's avatar Christopher Dykes Committed by Facebook Github Bot 1

Rename GetTickCount to GetClockTickCount

Summary: Because Windows already defines a funtion named `GetTickCount` with a different signature.

Reviewed By: yfeldblum

Differential Revision: D3601877

fbshipit-source-id: fa0fb422156a3dc71e149e02a000ccdf3479eea5
parent ccb2bd7f
...@@ -36,7 +36,7 @@ using namespace ::folly::hash; ...@@ -36,7 +36,7 @@ using namespace ::folly::hash;
static bool failed = false; static bool failed = false;
static uint64_t GetTickCount() { static uint64_t GetClockTickCount() {
timespec ts; timespec ts;
clock_gettime(CLOCK_REALTIME, &ts); clock_gettime(CLOCK_REALTIME, &ts);
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; // milliseconds return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; // milliseconds
...@@ -273,41 +273,41 @@ void DoTimingBig(int seed) ...@@ -273,41 +273,41 @@ void DoTimingBig(int seed)
memset(buf[i], (char)seed, BUFSIZE); memset(buf[i], (char)seed, BUFSIZE);
} }
uint64_t a = GetTickCount(); uint64_t a = GetClockTickCount();
uint64_t hash1 = seed; uint64_t hash1 = seed;
uint64_t hash2 = seed; uint64_t hash2 = seed;
for (uint64_t i=0; i<NUMBUF; ++i) for (uint64_t i=0; i<NUMBUF; ++i)
{ {
SpookyHashV1::Hash128(buf[i], BUFSIZE, &hash1, &hash2); SpookyHashV1::Hash128(buf[i], BUFSIZE, &hash1, &hash2);
} }
uint64_t z = GetTickCount(); uint64_t z = GetClockTickCount();
printf("SpookyHashV1::Hash128, uncached: time is " printf("SpookyHashV1::Hash128, uncached: time is "
"%4" PRIu64 " milliseconds\n", z-a); "%4" PRIu64 " milliseconds\n", z-a);
a = GetTickCount(); a = GetClockTickCount();
for (uint64_t i=0; i<NUMBUF; ++i) for (uint64_t i=0; i<NUMBUF; ++i)
{ {
Add(buf[i], BUFSIZE, &hash1, &hash2); Add(buf[i], BUFSIZE, &hash1, &hash2);
} }
z = GetTickCount(); z = GetClockTickCount();
printf("Addition , uncached: time is " printf("Addition , uncached: time is "
"%4" PRIu64 " milliseconds\n", z-a); "%4" PRIu64 " milliseconds\n", z-a);
a = GetTickCount(); a = GetClockTickCount();
for (uint64_t i=0; i<NUMBUF*BUFSIZE/1024; ++i) for (uint64_t i=0; i<NUMBUF*BUFSIZE/1024; ++i)
{ {
SpookyHashV1::Hash128(buf[0], 1024, &hash1, &hash2); SpookyHashV1::Hash128(buf[0], 1024, &hash1, &hash2);
} }
z = GetTickCount(); z = GetClockTickCount();
printf("SpookyHashV1::Hash128, cached: time is " printf("SpookyHashV1::Hash128, cached: time is "
"%4" PRIu64 " milliseconds\n", z-a); "%4" PRIu64 " milliseconds\n", z-a);
a = GetTickCount(); a = GetClockTickCount();
for (uint64_t i=0; i<NUMBUF*BUFSIZE/1024; ++i) for (uint64_t i=0; i<NUMBUF*BUFSIZE/1024; ++i)
{ {
Add(buf[0], 1024, &hash1, &hash2); Add(buf[0], 1024, &hash1, &hash2);
} }
z = GetTickCount(); z = GetClockTickCount();
printf("Addition , cached: time is " printf("Addition , cached: time is "
"%4" PRIu64 " milliseconds\n", z-a); "%4" PRIu64 " milliseconds\n", z-a);
...@@ -336,14 +336,14 @@ void DoTimingSmall(int seed) ...@@ -336,14 +336,14 @@ void DoTimingSmall(int seed)
for (int i=1; i <= BUFSIZE; i <<= 1) for (int i=1; i <= BUFSIZE; i <<= 1)
{ {
uint64_t a = GetTickCount(); uint64_t a = GetClockTickCount();
uint64_t hash1 = seed; uint64_t hash1 = seed;
uint64_t hash2 = seed+i; uint64_t hash2 = seed+i;
for (int j=0; j<NUMITER; ++j) for (int j=0; j<NUMITER; ++j)
{ {
SpookyHashV1::Hash128((char *)buf, i, &hash1, &hash2); SpookyHashV1::Hash128((char *)buf, i, &hash1, &hash2);
} }
uint64_t z = GetTickCount(); uint64_t z = GetClockTickCount();
printf("%d bytes: hash is %.16" PRIx64 " %.16" PRIx64 ", " printf("%d bytes: hash is %.16" PRIx64 " %.16" PRIx64 ", "
"time is %" PRIu64 "\n", i, hash1, hash2, z-a); "time is %" PRIu64 "\n", i, hash1, hash2, z-a);
} }
......
...@@ -36,7 +36,7 @@ using namespace ::folly::hash; ...@@ -36,7 +36,7 @@ using namespace ::folly::hash;
static bool failed = false; static bool failed = false;
static uint64_t GetTickCount() { static uint64_t GetClockTickCount() {
timespec ts; timespec ts;
clock_gettime(CLOCK_REALTIME, &ts); clock_gettime(CLOCK_REALTIME, &ts);
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; // milliseconds return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; // milliseconds
...@@ -263,41 +263,41 @@ void DoTimingBig(int seed) ...@@ -263,41 +263,41 @@ void DoTimingBig(int seed)
memset(buf[i], (char)seed, BUFSIZE); memset(buf[i], (char)seed, BUFSIZE);
} }
uint64_t a = GetTickCount(); uint64_t a = GetClockTickCount();
uint64_t hash1 = seed; uint64_t hash1 = seed;
uint64_t hash2 = seed; uint64_t hash2 = seed;
for (uint64_t i=0; i<NUMBUF; ++i) for (uint64_t i=0; i<NUMBUF; ++i)
{ {
SpookyHashV2::Hash128(buf[i], BUFSIZE, &hash1, &hash2); SpookyHashV2::Hash128(buf[i], BUFSIZE, &hash1, &hash2);
} }
uint64_t z = GetTickCount(); uint64_t z = GetClockTickCount();
printf("SpookyHashV2::Hash128, uncached: time is " printf("SpookyHashV2::Hash128, uncached: time is "
"%4" PRId64 " milliseconds\n", z-a); "%4" PRId64 " milliseconds\n", z-a);
a = GetTickCount(); a = GetClockTickCount();
for (uint64_t i=0; i<NUMBUF; ++i) for (uint64_t i=0; i<NUMBUF; ++i)
{ {
Add(buf[i], BUFSIZE, &hash1, &hash2); Add(buf[i], BUFSIZE, &hash1, &hash2);
} }
z = GetTickCount(); z = GetClockTickCount();
printf("Addition , uncached: time is %4" PRId64 " milliseconds\n", printf("Addition , uncached: time is %4" PRId64 " milliseconds\n",
z-a); z-a);
a = GetTickCount(); a = GetClockTickCount();
for (uint64_t i=0; i<NUMBUF*BUFSIZE/1024; ++i) for (uint64_t i=0; i<NUMBUF*BUFSIZE/1024; ++i)
{ {
SpookyHashV2::Hash128(buf[0], 1024, &hash1, &hash2); SpookyHashV2::Hash128(buf[0], 1024, &hash1, &hash2);
} }
z = GetTickCount(); z = GetClockTickCount();
printf("SpookyHashV2::Hash128, cached: time is " printf("SpookyHashV2::Hash128, cached: time is "
"%4" PRId64 " milliseconds\n", z-a); "%4" PRId64 " milliseconds\n", z-a);
a = GetTickCount(); a = GetClockTickCount();
for (uint64_t i=0; i<NUMBUF*BUFSIZE/1024; ++i) for (uint64_t i=0; i<NUMBUF*BUFSIZE/1024; ++i)
{ {
Add(buf[0], 1024, &hash1, &hash2); Add(buf[0], 1024, &hash1, &hash2);
} }
z = GetTickCount(); z = GetClockTickCount();
printf("Addition , cached: time is %4" PRId64 " milliseconds\n", printf("Addition , cached: time is %4" PRId64 " milliseconds\n",
z-a); z-a);
...@@ -326,14 +326,14 @@ void DoTimingSmall(int seed) ...@@ -326,14 +326,14 @@ void DoTimingSmall(int seed)
for (int i=1; i <= BUFSIZE; i <<= 1) for (int i=1; i <= BUFSIZE; i <<= 1)
{ {
uint64_t a = GetTickCount(); uint64_t a = GetClockTickCount();
uint64_t hash1 = seed; uint64_t hash1 = seed;
uint64_t hash2 = seed+i; uint64_t hash2 = seed+i;
for (int j=0; j<NUMITER; ++j) for (int j=0; j<NUMITER; ++j)
{ {
SpookyHashV2::Hash128((char *)buf, i, &hash1, &hash2); SpookyHashV2::Hash128((char *)buf, i, &hash1, &hash2);
} }
uint64_t z = GetTickCount(); uint64_t z = GetClockTickCount();
printf("%d bytes: hash is %.16" PRIx64 " %.16" PRIx64 ", " printf("%d bytes: hash is %.16" PRIx64 " %.16" PRIx64 ", "
"time is %" PRId64 "\n", i, hash1, hash2, z-a); "time is %" PRId64 "\n", i, hash1, hash2, z-a);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment